diff for duplicates of <20100604103951.GE5483@bicker> diff --git a/a/1.txt b/N1/1.txt index 252ce4e..13a1120 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ index 112da7a..6b8268d 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c @@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev, - Status copy_to_user(erq->pointer, pAd->nickname, + Status = + copy_to_user(erq->pointer, pAd->nickname, erq->length); + if (Status) + Status = -EFAULT; diff --git a/a/content_digest b/N1/content_digest index ec19eee..2f6b631 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] Staging: rc2860: return -EFAULT on copy_to_user errors\0" - "Date\0Fri, 04 Jun 2010 10:39:51 +0000\0" + "Date\0Fri, 4 Jun 2010 12:39:51 +0200\0" "To\0Greg Kroah-Hartman <gregkh@suse.de>\0" "Cc\0Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>" devel@driverdev.osuosl.org @@ -19,7 +19,8 @@ "--- a/drivers/staging/rt2860/sta_ioctl.c\n" "+++ b/drivers/staging/rt2860/sta_ioctl.c\n" "@@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,\n" - " \t\t\tStatus \t\t\t copy_to_user(erq->pointer, pAd->nickname,\n" + " \t\t\tStatus =\n" + " \t\t\t copy_to_user(erq->pointer, pAd->nickname,\n" " \t\t\t\t\t erq->length);\n" "+\t\t\tif (Status)\n" "+\t\t\t\tStatus = -EFAULT;\n" @@ -27,4 +28,4 @@ " \t\t}\n" " \tcase SIOCGIWRATE:\t/*get default bit rate (bps) */" -b384e0387bbe80cd1238301404cac24966bedc0daa2624f435ffa628b1fab3a5 +a852b6c50625239c5ec2ccf7e442ee03756b6f1bf7f5c310d3a9532a597fac77
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.