The patch titled
Subject: drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
has been added to the -mm tree. Its filename is
rapidio-mport_cdev-nul-terminate-some-strings.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rapidio-mport_cdev-nul-terminate-some-strings.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rapidio-mport_cdev-nul-terminate-some-strings.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
The dev_info.name[] array has space for RIO_MAX_DEVNAME_SZ + 1 characters.
But the problem here is that we don't ensure that the user put a NUL
terminator on the end of the string. It could lead to an out of bounds
read.
Link: http://lkml.kernel.org/r/20190529110601.GB19119@mwanda
Fixes: e8de370188d0 ("rapidio: add mport char device driver")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: Alexandre Bounine <alex.bou9@xxxxxxxxx>
Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rapidio/devices/rio_mport_cdev.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/rapidio/devices/rio_mport_cdev.c~rapidio-mport_cdev-nul-terminate-some-strings
+++ a/drivers/rapidio/devices/rio_mport_cdev.c
@@ -1690,6 +1690,7 @@ static int rio_mport_add_riodev(struct m
if (copy_from_user(&dev_info, arg, sizeof(dev_info)))
return -EFAULT;
+ dev_info.name[sizeof(dev_info.name) - 1] = '\0';
rmcd_debug(RDEV, "name:%s ct:0x%x did:0x%x hc:0x%x", dev_info.name,
dev_info.comptag, dev_info.destid, dev_info.hopcount);
@@ -1821,6 +1822,7 @@ static int rio_mport_del_riodev(struct m
if (copy_from_user(&dev_info, arg, sizeof(dev_info)))
return -EFAULT;
+ dev_info.name[sizeof(dev_info.name) - 1] = '\0';
mport = priv->md->mport;
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
coda-get-rid-of-coda_alloc.patch
coda-get-rid-of-coda_free.patch
rapidio-mport_cdev-nul-terminate-some-strings.patch
