2023-07-21 15:08:45

by Dan Carpenter

Subject: [PATCH] lib/string_helpers: Use passed in GFP_ flags

This patch doesn't affect runtime because all the callers pass GFP_KERNEL
as the allocation flags. However, it should use the passed in "gfp" as
the allocation flags.

Fixes: 0ee931c4e31a ("mm: treewide: remove GFP_TEMPORARY allocation flag")
Signed-off-by: Dan Carpenter <[email protected]>
---
lib/string_helpers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index d3b1dd718daf..be517c25737d 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -668,7 +668,7 @@ char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
char *buffer, *quoted;
int i, res;

- buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
+ buffer = kmalloc(PAGE_SIZE, gfp);
if (!buffer)
return NULL;

@@ -704,7 +704,7 @@ char *kstrdup_quotable_file(struct file *file, gfp_t gfp)
return kstrdup("<unknown>", gfp);

/* We add 11 spaces for ' (deleted)' to be appended */
- temp = kmalloc(PATH_MAX + 11, GFP_KERNEL);
+ temp = kmalloc(PATH_MAX + 11, gfp);
if (!temp)
return kstrdup("<no_memory>", gfp);

--
2.39.2

2023-07-21 15:11:48

by Andy Shevchenko

Subject: Re: [PATCH] lib/string_helpers: Use passed in GFP_ flags

On Fri, Jul 21, 2023 at 05:57:00PM +0300, Dan Carpenter wrote:
> This patch doesn't affect runtime because all the callers pass GFP_KERNEL
> as the allocation flags. However, it should use the passed in "gfp" as
> the allocation flags.

Please, Cc Kees Cook as he stepped in as a maintainer of this in particular.

Reviewed-by: Andy Shevchenko <[email protected]>

> Fixes: 0ee931c4e31a ("mm: treewide: remove GFP_TEMPORARY allocation flag")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> lib/string_helpers.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/string_helpers.c b/lib/string_helpers.c
> index d3b1dd718daf..be517c25737d 100644
> --- a/lib/string_helpers.c
> +++ b/lib/string_helpers.c
> @@ -668,7 +668,7 @@ char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
> char *buffer, *quoted;
> int i, res;
>
> - buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
> + buffer = kmalloc(PAGE_SIZE, gfp);
> if (!buffer)
> return NULL;
>
> @@ -704,7 +704,7 @@ char *kstrdup_quotable_file(struct file *file, gfp_t gfp)
> return kstrdup("<unknown>", gfp);
>
> /* We add 11 spaces for ' (deleted)' to be appended */
> - temp = kmalloc(PATH_MAX + 11, GFP_KERNEL);
> + temp = kmalloc(PATH_MAX + 11, gfp);
> if (!temp)
> return kstrdup("<no_memory>", gfp);
>
> --
> 2.39.2
>

--
With Best Regards,
Andy Shevchenko

2023-07-21 17:25:44

by Christophe JAILLET

Subject: Re: [PATCH] lib/string_helpers: Use passed in GFP_ flags

Le 21/07/2023 à 17:08, Andy Shevchenko a écrit :
> On Fri, Jul 21, 2023 at 05:57:00PM +0300, Dan Carpenter wrote:
>> This patch doesn't affect runtime because all the callers pass GFP_KERNEL
>> as the allocation flags. However, it should use the passed in "gfp" as
>> the allocation flags.
>
> Please, Cc Kees Cook as he stepped in as a maintainer of this in particular.
>
> Reviewed-by: Andy Shevchenko <[email protected]>

Hi,
just for the records, see [1].
Another approach was proposed by Michal Hocko in [2].

CJ

[1]:
https://lore.kernel.org/all/1ec96b6e4f2e35599931d7516c6938c4a8845bf0.1642337606.git.christophe.jaillet@wanadoo.fr/

[2]: https://lore.kernel.org/all/[email protected]/

>
>> Fixes: 0ee931c4e31a ("mm: treewide: remove GFP_TEMPORARY allocation flag")
>> Signed-off-by: Dan Carpenter <[email protected]>
>> ---
>> lib/string_helpers.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/string_helpers.c b/lib/string_helpers.c
>> index d3b1dd718daf..be517c25737d 100644
>> --- a/lib/string_helpers.c
>> +++ b/lib/string_helpers.c
>> @@ -668,7 +668,7 @@ char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
>> char *buffer, *quoted;
>> int i, res;
>>
>> - buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
>> + buffer = kmalloc(PAGE_SIZE, gfp);
>> if (!buffer)
>> return NULL;
>>
>> @@ -704,7 +704,7 @@ char *kstrdup_quotable_file(struct file *file, gfp_t gfp)
>> return kstrdup("<unknown>", gfp);
>>
>> /* We add 11 spaces for ' (deleted)' to be appended */
>> - temp = kmalloc(PATH_MAX + 11, GFP_KERNEL);
>> + temp = kmalloc(PATH_MAX + 11, gfp);
>> if (!temp)
>> return kstrdup("<no_memory>", gfp);
>>
>> --
>> 2.39.2
>>
>