Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605fba82 authored Oct 08, 2012 by Wei Yongjun Committed by Greg Kroah-Hartman Oct 22, 2012

staging: r8712u: fix potential NULL pointer dereference in r871x_wps_start()

The dereference should be moved below the NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch

)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a5e0f69c

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2110,10 +2110,10 @@ static int r871x_wps_start(struct net_device *dev,
		struct iw_point *pdata = &wrqu->data;
		u32 u32wps_start = 0;

		if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
		return -EFAULT;
		if ((padapter->bDriverStopped) \|\| (pdata == NULL))
		return -EINVAL;
		if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
		return -EFAULT;
		if (u32wps_start == 0)
		u32wps_start = *extra;
		if (u32wps_start == 1) /* WPS Start */