diff mbox series

lib/string_helpers: Use passed in GFP_ flags

Message ID df051844-0a73-4cf9-9719-a6001f1c9d5c@moroto.mountain
State New
Headers
Series lib/string_helpers: Use passed in GFP_ flags |

Commit Message

Dan Carpenter July 21, 2023, 2:57 p.m. UTC 
  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 <dan.carpenter@linaro.org>
---
 lib/string_helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

andy@kernel.org July 21, 2023, 3:08 p.m. UTC | #1 
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 <andy@kernel.org>

> Fixes: 0ee931c4e31a ("mm: treewide: remove GFP_TEMPORARY allocation flag")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  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
>
Christophe JAILLET July 21, 2023, 5:05 p.m. UTC | #2 
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 <andy@kernel.org>

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/YeWOd2G69LyR3PVZ@dhcp22.suse.cz/

> 
>> Fixes: 0ee931c4e31a ("mm: treewide: remove GFP_TEMPORARY allocation flag")
>> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
>> ---
>>   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
>>
>
diff mbox series

Patch

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);