UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: r8188eu: fix -Wrestrict warnings 

Adding back the nonstandard ioctl commands caused -Wrestrict warnings
when building with 'make W=1':

drivers/staging/r8188eu/os_dep/ioctl_linux.c: In function 'rtw_mp_read_rf':
drivers/staging/r8188eu/os_dep/ioctl_linux.c:5515:27: error: 'sprintf' argument 3 overlaps destination object 'extra' [-Werror=restrict]
 5515 |                           sprintf(extra, "%s %d", extra, strtou);
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/r8188eu/os_dep/ioctl_linux.c:5470:54: note: destination object referenced by 'restrict'-qualified argument 1 was declared here
 5470 |                         struct iw_point *wrqu, char *extra)
      |                                                ~~~~~~^~~~~

Change these to the same construct used elsewhere in that driver,
with an offset to the string to make the warning go away.

The ioctl commands were previously removed, and it's unlikely that
anything is actually using them, so ideally I would prefer to have
them removed again.

The lack of range checking of the 'extra' output buffer is also
slightly worrying, but I did not check whether this could cause
harm.

Fixes: 2b42bd58b3 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210920095525.1150678-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2021-09-20 11:55:09 +02:00 committed by Greg Kroah-Hartman
parent 92dc0b1f46
commit aa3233ea7b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/r8188eu/os_dep/ioctl_linux.c
View File

@ -5372,8 +5372,8 @@ static int rtw_mp_read_reg(struct net_device *dev,
pnext++; pnext++;
if (*pnext != '\0') { if (*pnext != '\0') {
strtout = simple_strtoul(pnext, &ptmp, 16); strtout = simple_strtoul(pnext, &ptmp, 16);
sprintf(extra, "%s %d", extra, strtout); sprintf(extra + strlen(extra), " %d", strtout);
} else { } else {
break; break;
} }
@ -5405,7 +5405,7 @@ static int rtw_mp_read_reg(struct net_device *dev,
pnext++; pnext++;
if (*pnext != '\0') { if (*pnext != '\0') {
strtout = simple_strtoul(pnext, &ptmp, 16); strtout = simple_strtoul(pnext, &ptmp, 16);
sprintf(extra, "%s %d", extra, strtout); sprintf(extra + strlen(extra), " %d", strtout);
} else { } else {
break; break;
} }
@ -5512,7 +5512,7 @@ static int rtw_mp_read_rf(struct net_device *dev,
pnext++; pnext++;
if (*pnext != '\0') { if (*pnext != '\0') {
strtou = simple_strtoul(pnext, &ptmp, 16); strtou = simple_strtoul(pnext, &ptmp, 16);
sprintf(extra, "%s %d", extra, strtou); sprintf(extra + strlen(extra), " %d", strtou);
} else { } else {
break; break;
} }