usbip: usbip_host: Replace strlcpy with strscpy
Subsystems (2)
PATCH v2 1/1 usbip: usbip_host: Replace strlcpy with strscpy
strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy().
Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
---
v1: https://lore.kernel.org/all/[email protected]/
Changes from v1 - uses "< 0" instead of "== -E2BIG".
drivers/usb/usbip/stub_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/usbip/stub_main.c +1 -2
@@ -174,8 +174,7 @@ static ssize_t match_busid_store(struct device_driver *dev, const char *buf,return -EINVAL ;/* busid needs to include \0 termination */ - len =strlcpy (busid, buf +4 ,BUSID_SIZE ); -if (sizeof (busid) <= len) +if (strscpy (busid, buf +4 ,BUSID_SIZE ) <0 )return -EINVAL ;if (!strncmp (buf,"add " ,4 )) {
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Quoted 27 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>---
v1: https://lore.kernel.org/all/[email protected]/Changes from v1 - uses "< 0" instead of "==
-E2BIG".drivers/usb/usbip/stub_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/usb/usbip/stub_main.c +0
-0
drivers/usb/usbip/stub_main.c static ssize_t match_busid_store(struct device_driver *dev, const char *buf, · line 180
Quoted 9 lines
drivers/usb/usbip/stub_main.c +1
-2@@ -174,8 +174,7 @@ static ssize_t match_busid_store(struct device_driver *dev, const char *buf,return -EINVAL ;/* busid needs to include \0 termination */ - len =strlcpy (busid, buf +4 ,BUSID_SIZE ); -if (sizeof (busid) <= len) +if (strscpy (busid, buf +4 ,BUSID_SIZE ) <0 )return -EINVAL ;if (!strncmp (buf,"add " ,4 )) {
Than you Kees for the review.
If Kees is happy, I am happy :)
thanks,
-- Shuah
Quoted 7 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
Quoted 7 lines
Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>
Signature · 1 line
Kees Cook
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Azeem,
kernel test robot noticed the following build warnings:
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on usb/usb-next usb/usb-linus linus/master v6.4-rc6 next-20230614] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Azeem-Shaikh/usbip-usbip_host-Replace-strlcpy-with-strscpy/20230614-221217 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing patch link: https://lore.kernel.org/r/20230614141026.2113749-1-azeemshaikh38%40gmail.com patch subject: [PATCH v2] usbip: usbip_host: Replace strlcpy with strscpy config: i386-randconfig-i012-20230614 (https://download.01.org/0day-ci/archive/20230615/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
git remote add usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
git fetch usb usb-testing
git checkout usb/usb-testing
b4 shazam https://lore.kernel.org/r/[email protected]
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/usb/usbip/
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/usb/usbip/stub_main.c: In function 'match_busid_store':
>> drivers/usb/usbip/stub_main.c:170:13: warning: unused variable 'len' [-Wunused-variable]
170 | int len;
| ^~~vim +/len +170 drivers/usb/usbip/stub_main.c
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 166
cc3d53def83a99 drivers/usb/usbip/stub_main.c Greg Kroah-Hartman 2017-06-09 167 static ssize_t match_busid_store(struct device_driver *dev, const char *buf,
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 168 size_t count)
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 169 {
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 @170 int len;
e913397202b755 drivers/staging/usbip/stub_main.c Kay Sievers 2008-10-30 171 char busid[BUSID_SIZE];
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 172
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 173 if (count < 5)
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 174 return -EINVAL;
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 175
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 176 /* busid needs to include \0 termination */
7e5b2b663aa01a drivers/usb/usbip/stub_main.c Azeem Shaikh 2023-06-14 177 if (strscpy(busid, buf + 4, BUSID_SIZE) < 0)
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 178 return -EINVAL;
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 179
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 180 if (!strncmp(buf, "add ", 4)) {
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 181 if (add_match_busid(busid) < 0)
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 182 return -ENOMEM;
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 183
1a4b6f66285785 drivers/staging/usbip/stub_main.c matt mooney 2011-05-19 184 pr_debug("add busid %s\n", busid);
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 185 return count;
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 186 }
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 187
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 188 if (!strncmp(buf, "del ", 4)) {
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 189 if (del_match_busid(busid) < 0)
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 190 return -ENODEV;
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 191
1a4b6f66285785 drivers/staging/usbip/stub_main.c matt mooney 2011-05-19 192 pr_debug("del busid %s\n", busid);
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 193 return count;
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 194 }
2183b77ece517f drivers/staging/usbip/stub_main.c Kurt Kanzenbach 2013-04-04 195
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 196 return -EINVAL;
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 197 }
cc3d53def83a99 drivers/usb/usbip/stub_main.c Greg Kroah-Hartman 2017-06-09 198 static DRIVER_ATTR_RW(match_busid);
4d7b5c7f8ad49b drivers/staging/usbip/stub_main.c Takahiro Hirofuchi 2008-07-09 199 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Greg Kroah-Hartman
maintainerQuoted 10 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
Quoted 8 lines
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>---
v1: https://lore.kernel.org/all/[email protected]/Changes from v1 - uses "< 0" instead of "==
-E2BIG".
Please fix the reported errors from the build bot.
thanks
greg k-h
Quoted 15 lines · Greg Kroah-Hartman
Quoted 13 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().Direct replacement is safe here since return value of -errno is used to check for truncation instead of sizeof(dest).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
Quoted 8 lines
Quoted 5 lines
Signed-off-by Azeem Shaikh <[email protected]>---
v1: https://lore.kernel.org/all/[email protected]/Changes from v1 - uses "< 0" instead of "==
-E2BIG".Please fix the reported errors from the build bot.
Sorry about that, I was hasty with sending out v2. Sent out a build tested v3.