From dd0ddda7fd2bf784cf198c5da4c945d959c23115 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 6 Aug 2011 07:27:48 -0700 Subject: [PATCH] --- yaml --- r: 267605 b: refs/heads/master c: 5ae717139a6defae9656f743dff8388aeb94df93 h: refs/heads/master i: 267603: 9b05447640cfc619ddd42e37ea6071d68a022737 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38b542cd5ce7..7b9594f7e67c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 733e3ef0d364b7e6757a897e7f1862a70c89305a +refs/heads/master: 5ae717139a6defae9656f743dff8388aeb94df93 diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 59bdab105334..d310a6174b97 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -2089,9 +2089,10 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p) param = (struct ieee_param *)_malloc(p->length); if (param == NULL) return -ENOMEM; - if (copy_from_user(param, p->pointer, p->length)) + if (copy_from_user(param, p->pointer, p->length)) { kfree((u8 *)param); return -EFAULT; + } switch (param->cmd) { case IEEE_CMD_SET_WPA_PARAM: ret = wpa_set_param(dev, param->u.wpa_param.name,