Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Apr 2018 16:19:11 +0000
From:      Brooks Davis <brooks@freebsd.org>
To:        Glen Barber <gjb@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:  <20180409161911.GC3560@spindle.one-eyed-alien.net>
In-Reply-To: <20180409153250.GB3560@spindle.one-eyed-alien.net>
References:  <201804081654.w38Gs7JY007779@repo.freebsd.org> <20180409135849.GA84067@FreeBSD.org> <20180409153250.GB3560@spindle.one-eyed-alien.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--1LKvkjL3sHcu1TtY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Apr 09, 2018 at 03:32:50PM +0000, Brooks Davis wrote:
> On Mon, Apr 09, 2018 at 01:58:49PM +0000, Glen Barber wrote:
> > 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
> >=20
> > > 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
> >=20
> > This part of the change appears to have broken i386 with the following:
>=20
> Sorry about this, will fix shortly.

Fixed in r332331.

-- Brooks

--1LKvkjL3sHcu1TtY
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEcBAEBAgAGBQJay5J/AAoJEKzQXbSebgfAT4gH/1dY7yDxUyfscJ9TrUuianVi
usazJ9LnZvvm85ONAW//7fwAmllrp5yKMt/+h3RffUyvcC3jWJHC5m7kBy2+6ECl
qoVwuB/nkgFyS8ReT834ntt4DkLyjMI/QiAY7RuUFOy+CRzvbeDl0Z/hbMDm2SaS
eARgvStpE3tc8qllzYhDr+jIKjRyCYxyLitM7erdHer6dRI79OTXOhDhZx96mYIM
V3ET1R4ltUY8pp2/eii+pJ4+qjw7PHerij4+kKfrcc5/20qEGGedjIaSyG+10tQa
GXFxVDfjbM5KxE3yBCbSPkZNnbH+43VmtiPjYzVCHJHCBTdtIYBZE37IU1HRFRw=
=RbjH
-----END PGP SIGNATURE-----

--1LKvkjL3sHcu1TtY--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180409161911.GC3560>