Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

isdn: kcapi: replace deprecated strncpy with strscpy_pad

`strncpy` is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

`buf` is used in this context as a data buffer with 64 bytes of memory
to be occupied by capi_manufakturer.

We see the caller capi20_get_manufacturer() passes data.manufacturer as
its `buf` argument which is then later passed over to user space. Due to
this, let's keep the NUL-padding that strncpy provided by using
strscpy_pad so as to not leak any stack data.
| cdev->errcode = capi20_get_manufacturer(data.contr, data.manufacturer);
| if (cdev->errcode)
| return -EIO;
|
| if (copy_to_user(argp, data.manufacturer,
| sizeof(data.manufacturer)))
| return -EFAULT;

Perhaps this would also be a good instance to use `strtomem_pad` for but
in my testing the compiler was not able to determine the size of `buf`
-- even with all the hints.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230922-strncpy-drivers-isdn-capi-kcapi-c-v1-1-55fcf8b075fb@google.com
Signed-off-by: Kees Cook <keescook@chromium.org>

authored by

Justin Stitt and committed by
Kees Cook
cba58fcb 5c80c4fc

+2 -2
+2 -2
drivers/isdn/capi/kcapi.c
··· 732 732 u16 ret; 733 733 734 734 if (contr == 0) { 735 - strncpy(buf, capi_manufakturer, CAPI_MANUFACTURER_LEN); 735 + strscpy_pad(buf, capi_manufakturer, CAPI_MANUFACTURER_LEN); 736 736 return CAPI_NOERROR; 737 737 } 738 738 ··· 740 740 741 741 ctr = get_capi_ctr_by_nr(contr); 742 742 if (ctr && ctr->state == CAPI_CTR_RUNNING) { 743 - strncpy(buf, ctr->manu, CAPI_MANUFACTURER_LEN); 743 + strscpy_pad(buf, ctr->manu, CAPI_MANUFACTURER_LEN); 744 744 ret = CAPI_NOERROR; 745 745 } else 746 746 ret = CAPI_REGNOTINSTALLED;