dma-buf: use strscpy() to instead of strlcpy()
Subsystems (2)
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.
Signed-off-by Xu Panda <[email protected]>
Signed-off-by Yang Yang <[email protected]>
--- drivers/dma-buf/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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 );spin_unlock (&dmabuf->name_lock); return dynamic_dname(buffer, buflen, "/%s:%s",
Signature · 1 line
2.15.2
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.Signed-off-by Xu Panda <[email protected]>Signed-off-by Yang Yang <[email protected]>--- drivers/dma-buf/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/dma-buf/dma-buf.c +0
-0
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
-1spin_unlock (&dmabuf->name_lock); return dynamic_dname(buffer, buflen, "/%s:%s", --2.15.2