2018-09-04 08:43:32

by Ding Xiang

Subject: [PATCH] security: tomoyo: Fix obsolete function

simple_strtoul is obsolete, and use kstrtouint instead

Signed-off-by: Ding Xiang <[email protected]>
---
security/tomoyo/common.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 03923a1..9b38f94 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1660,7 +1660,8 @@ static void tomoyo_read_pid(struct tomoyo_io_buffer *head)
head->r.eof = true;
if (tomoyo_str_starts(&buf, "global-pid "))
global_pid = true;
- pid = (unsigned int) simple_strtoul(buf, NULL, 10);
+ if (kstrtouint(buf, 10, &pid))
+ return;
rcu_read_lock();
if (global_pid)
p = find_task_by_pid_ns(pid, &init_pid_ns);
--
1.9.1

2018-09-04 10:24:39

by Tetsuo Handa

Subject: Re: [PATCH] security: tomoyo: Fix obsolete function

On 2018/09/04 17:41, Ding Xiang wrote:
> simple_strtoul is obsolete, and use kstrtouint instead
>
> Signed-off-by: Ding Xiang <[email protected]>

Acked-by: Tetsuo Handa <[email protected]>

> ---
> security/tomoyo/common.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
> index 03923a1..9b38f94 100644
> --- a/security/tomoyo/common.c
> +++ b/security/tomoyo/common.c
> @@ -1660,7 +1660,8 @@ static void tomoyo_read_pid(struct tomoyo_io_buffer *head)
> head->r.eof = true;
> if (tomoyo_str_starts(&buf, "global-pid "))
> global_pid = true;
> - pid = (unsigned int) simple_strtoul(buf, NULL, 10);
> + if (kstrtouint(buf, 10, &pid))
> + return;
> rcu_read_lock();
> if (global_pid)
> p = find_task_by_pid_ns(pid, &init_pid_ns);
>

2018-09-04 18:59:48

by James Morris

Subject: Re: [PATCH] security: tomoyo: Fix obsolete function

On Tue, 4 Sep 2018, Ding Xiang wrote:

> simple_strtoul is obsolete, and use kstrtouint instead
>
> Signed-off-by: Ding Xiang <[email protected]>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general

and next-testing.



--
James Morris
<[email protected]>