2020-02-02 23:27:33

by Trond Myklebust

Subject: [PATCH 3/4] NFS: Use kmemdup_nul() in nfs_readdir_make_qstr()

The directory strings stored in the readdir cache may be used with
printk(), so it is better to ensure they are nul-terminated.

Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 90467b44ec13..60387dec9032 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -199,7 +199,7 @@ static
int nfs_readdir_make_qstr(struct qstr *string, const char *name, unsigned int len)
{
string->len = len;
- string->name = kmemdup(name, len, GFP_KERNEL);
+ string->name = kmemdup_nul(name, len, GFP_KERNEL);
if (string->name == NULL)
return -ENOMEM;
/*
--
2.24.1

2020-02-03 15:12:44

by Benjamin Coddington

Subject: Re: [PATCH 3/4] NFS: Use kmemdup_nul() in nfs_readdir_make_qstr()

On 2 Feb 2020, at 17:53, Trond Myklebust wrote:

> The directory strings stored in the readdir cache may be used with
> printk(), so it is better to ensure they are nul-terminated.
>
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
> fs/nfs/dir.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 90467b44ec13..60387dec9032 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -199,7 +199,7 @@ static
> int nfs_readdir_make_qstr(struct qstr *string, const char *name,
> unsigned int len)
> {
> string->len = len;
> - string->name = kmemdup(name, len, GFP_KERNEL);
> + string->name = kmemdup_nul(name, len, GFP_KERNEL);
> if (string->name == NULL)
> return -ENOMEM;
> /*

Reviewed-by: Benjamin Coddington <[email protected]>

Ben