diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
| commit | fe33c0fbed75dd464747c0faaedf94c7d8eb4101 (patch) | |
| tree | 057a9d98ca492c55708baedcc59bf2ea3e2511c7 /drivers/dma-buf/dma-buf.c | |
| parent | 5d4747a6cc8e78ce74742d557fc9b7697fcacc95 (diff) | |
| parent | 052d534373b7ed33712a63d5e17b2b6cdbce84fd (diff) | |
| download | linux-fe33c0fbed75dd464747c0faaedf94c7d8eb4101.tar.xz | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 21916bba77d5..8fe5aa67b167 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -46,12 +46,12 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) { struct dma_buf *dmabuf; char name[DMA_BUF_NAME_LEN]; - size_t ret = 0; + ssize_t ret = 0; 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, sizeof(name)); spin_unlock(&dmabuf->name_lock); return dynamic_dname(buffer, buflen, "/%s:%s", |