Skip to contentSkip to conversation

dma-buf: use strscpy() to instead of strlcpy()

PATCH In review [email protected] 2 participants 2 messages Nov 24, 2022 – Nov 29, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-buf: use strscpy() to instead of strlcpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings.

---
 drivers/dma-buf/dma-buf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/dma-buf.c +1 -1
index b6c36914e7c6..485cf4f3431e 100644
@@ -51,7 +51,7 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
 	dmabuf = dentry->d_fsdata;
 	spin_lock(&dmabuf->name_lock);
 	if (dmabuf->name)
-		ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
+		ret = strscpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
 	spin_unlock(&dmabuf->name_lock);
 
 	return dynamic_dname(buffer, buflen, "/%s:%s",
Signature · 1 line
2.15.2
#1 lore raw
Quoted 17 lines · On Thu, Nov 24, 2022 at 3:26 AM <[email protected]> wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings.

---
 drivers/dma-buf/dma-buf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/dma-buf.c +0 -0
index b6c36914e7c6..485cf4f3431e 100644

drivers/dma-buf/dma-buf.c static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) · line 54

Quoted 5 lines
drivers/dma-buf/dma-buf.c +1 -1
@@ -51,7 +51,7 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
        dmabuf = dentry->d_fsdata;
        spin_lock(&dmabuf->name_lock);
        if (dmabuf->name)
-               ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
+               ret = strscpy(name, dmabuf->name, DMA_BUF_NAME_LEN);

The type of ret should also be changed to ssize_t to capture the negative error value which strlcpy does not have. We shouldn't ever see that error condition here with the code the way it is now, but let's not risk it.

Quoted 5 lines
drivers/dma-buf/dma-buf.c +0 -1
        spin_unlock(&dmabuf->name_lock);
 
        return dynamic_dname(buffer, buflen, "/%s:%s",
--

2.15.2