Date: Mon, 9 Apr 2018 13:58:49 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Brooks Davis <brooks@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r332288 - in stable/11/sys: dev/an dev/ath dev/cxgbe dev/de dev/en dev/fatm dev/hatm dev/if_ndis dev/iwi dev/ixgbe dev/ixl dev/mlx4/mlx4_en dev/mlx5/mlx5_en dev/mwl dev/nxge dev/oce dev... Message-ID: <20180409135849.GA84067@FreeBSD.org> In-Reply-To: <201804081654.w38Gs7JY007779@repo.freebsd.org> References: <201804081654.w38Gs7JY007779@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--82I3+IH0IqGh5yIs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 08, 2018 at 04:54:07PM +0000, Brooks Davis wrote: > Author: brooks > Date: Sun Apr 8 16:54:07 2018 > New Revision: 332288 > URL: https://svnweb.freebsd.org/changeset/base/332288 >=20 > Log: > MFC r331797: > =20 > Use an accessor function to access ifr_data. > =20 > This fixes 32-bit compat (no ioctl command defintions are required > as struct ifreq is the same size). > =20 > Reviewed by: kib > Obtained from: CheriBSD > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D14900 >=20 > Modified: [...] > stable/11/sys/dev/wl/if_wl.c > Directory Properties: > stable/11/ (props changed) >=20 [...] > Modified: stable/11/sys/dev/wl/if_wl.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/11/sys/dev/wl/if_wl.c Sun Apr 8 16:46:24 2018 (r332287) > +++ stable/11/sys/dev/wl/if_wl.c Sun Apr 8 16:54:07 2018 (r332288) > @@ -1313,7 +1313,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data) > } > WL_UNLOCK(sc); > =20 > - error =3D copyout(psa_buf, ifr->ifr_data, sizeof(psa_buf)); > + error =3D copyout(psa_buf, ifr_data_get_ptr(ifr), sizeof(psa_buf)); > break; > =20 > =20 > @@ -1323,7 +1323,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data) > if ((error =3D priv_check(td, PRIV_DRIVER))) > break; > =20 > - error =3D copyin(ifr->ifr_data, psa_buf, sizeof(psa_buf)); > + error =3D copyin(ifr_data_get_ptr(ifr), psa_buf, sizeof(psa_buf)); > if (error) > break; > =09 > @@ -1357,7 +1357,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data) > /* get the current NWID out of the sc since we stored it there */ > case SIOCGWLCNWID: > WL_LOCK(sc); > - ifr->ifr_data =3D (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]); > + ifr_data_get_ptr(ifr) =3D (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]); > WL_UNLOCK(sc); > break; > =20 This part of the change appears to have broken i386 with the following: /usr/src/sys/modules/wl/../../dev/wl/if_wl.c:1360:24: error: expression is= not assignable ifr_data_get_ptr(ifr) =3D (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1= ]); ~~~~~~~~~~~~~~~~~~~~~ ^ 1 error generated. --- if_wl.o --- *** [if_wl.o] Error code 1 make[4]: stopped in /usr/src/sys/modules/wl 1 error Glen --82I3+IH0IqGh5yIs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlrLcZkACgkQAxRYpUeP 4pNpFRAAgEQj8AQMV+Kdt6xTLxrUejFNBrWsEAWhYrggK5OYyRCSbYcVfxTv8Va1 5q9HsuA/UpCoIAPdZznowhXzdAYUg7+jIo3z401N1Q9Lj2CPKqQZzVN3eyPXYaxk D4XgfeJV2AfrkHB9TvIVNVcfOuPGnDueTk8EYnLSWsQ3lPjh5luSnmPpe+wazZpl 6IAJh2qbECzSJihGd6yp6nXWJz42+q56N2B9Ccg0oUgf8zs7ncPoF5gOFSfDcdCp sGHhOXR9+Y9d1dB2r9eU0KhZYdH3DlY0uG7nFFIwxd3Yd4Mwwd4ubUF3nkpn/y3b qbioQdIFu2pCcnJQt6R4UibVqzOf/DeBwAhBmZfPsckAlWFBbSITRSb9zDHmIJMM PUIO2Mb3yBraAQUfLRCodq4qleUdA1w1mcAy85mp+f+iK6XHYJ42nCiSq/iGy2DO DysR5N7b5TvP/pmbcYBr/qv1oJAZva3w2LZFGB/dEsYTYYmdZLp1zMIROgIBtlO6 F71ECZtMAPIVBFl3evYiMCl9j5lnbkBvAi1HIG4PAhuTu22OjPPTw+7kACwbvcoI 1dI+x8hq1UOj+RM9S383a2K2vBs+D2PveepNQwSqJ+iP1Jp0uqbee+V9hq0cbk9z H6Uey4CX7cBKvjjTtOiNWHkr8OTHEibw8lZ8zyDKvQXQEZ5QfsY= =5Y1d -----END PGP SIGNATURE----- --82I3+IH0IqGh5yIs--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180409135849.GA84067>