* [PATCH] sched/core: fix buffer overflow in cgroup2 property cpu.max
@ 2019-03-06 17:11 ` Konstantin Khlebnikov
0 siblings, 0 replies; 5+ messages in thread
From: Konstantin Khlebnikov @ 2019-03-06 17:11 UTC (permalink / raw)
To: Tejun Heo, Peter Zijlstra (Intel), linux-kernel
Cc: cgroups, Li Zefan, Ingo Molnar, Johannes Weiner
Add limit into sscanf format string for on-stack buffer.
Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 43f44539b88f..3971bc62521d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6968,7 +6968,7 @@ static int __maybe_unused cpu_period_quota_parse(char *buf,
{
char tok[21]; /* U64_MAX */
- if (!sscanf(buf, "%s %llu", tok, periodp))
+ if (sscanf(buf, "%20s %llu", tok, periodp) < 1)
return -EINVAL;
*periodp *= NSEC_PER_USEC;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] sched/core: fix buffer overflow in cgroup2 property cpu.max
2019-03-06 17:11 ` Konstantin Khlebnikov
(?)
@ 2019-03-06 18:07 ` Tejun Heo
-1 siblings, 0 replies; 5+ messages in thread
From: Tejun Heo @ 2019-03-06 18:07 UTC (permalink / raw)
To: Konstantin Khlebnikov
Cc: Peter Zijlstra (Intel),
linux-kernel, cgroups, Li Zefan, Ingo Molnar, Johannes Weiner
On Wed, Mar 06, 2019 at 08:11:42PM +0300, Konstantin Khlebnikov wrote:
> Add limit into sscanf format string for on-stack buffer.
>
> Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy")
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Tejun Heo <tj@kernel.org>
Thanks and I look forward to the sscanf improvements. That'd be
really nice to have.
--
tejun
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip:sched/urgent] sched/core: Fix buffer overflow in cgroup2 property cpu.max
2019-03-06 17:11 ` Konstantin Khlebnikov
(?)
(?)
@ 2019-03-09 14:36 ` tip-bot for Konstantin Khlebnikov
-1 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Konstantin Khlebnikov @ 2019-03-09 14:36 UTC (permalink / raw)
To: linux-tip-commits
Cc: khlebnikov, dave.hansen, peterz, hpa, luto, linux-kernel, hannes,
bp, lizefan, mingo, tglx, torvalds, tj, riel
Commit-ID: 5105fa52df1f249f996308188dd1e85c3ae62de5
Gitweb: https://git.kernel.org/tip/5105fa52df1f249f996308188dd1e85c3ae62de5
Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
AuthorDate: Wed, 6 Mar 2019 20:11:42 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 9 Mar 2019 14:03:51 +0100
sched/core: Fix buffer overflow in cgroup2 property cpu.max
Add limit into sscanf format string for on-stack buffer.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy")
Link: https://lkml.kernel.org/r/155189230232.2620.13120481613524200065.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6b2c055564b5..b7a4afdc33cb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6943,7 +6943,7 @@ static int __maybe_unused cpu_period_quota_parse(char *buf,
{
char tok[21]; /* U64_MAX */
- if (!sscanf(buf, "%s %llu", tok, periodp))
+ if (sscanf(buf, "%20s %llu", tok, periodp) < 1)
return -EINVAL;
*periodp *= NSEC_PER_USEC;
^ permalink raw reply related [flat|nested] 5+ messages in thread* [tip:sched/urgent] sched/core: Fix buffer overflow in cgroup2 property cpu.max
2019-03-06 17:11 ` Konstantin Khlebnikov
` (2 preceding siblings ...)
(?)
@ 2019-03-19 11:11 ` tip-bot for Konstantin Khlebnikov
-1 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Konstantin Khlebnikov @ 2019-03-19 11:11 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, riel, lizefan, hpa, khlebnikov, tj, bp, tglx, peterz,
linux-kernel, mingo, hannes, dave.hansen, luto
Commit-ID: 4c47acd824aaaa8fc6dc519fb4e08d1522105b7a
Gitweb: https://git.kernel.org/tip/4c47acd824aaaa8fc6dc519fb4e08d1522105b7a
Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
AuthorDate: Wed, 6 Mar 2019 20:11:42 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 19 Mar 2019 12:06:15 +0100
sched/core: Fix buffer overflow in cgroup2 property cpu.max
Add limit into sscanf format string for on-stack buffer.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy")
Link: https://lkml.kernel.org/r/155189230232.2620.13120481613524200065.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6b2c055564b5..b7a4afdc33cb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6943,7 +6943,7 @@ static int __maybe_unused cpu_period_quota_parse(char *buf,
{
char tok[21]; /* U64_MAX */
- if (!sscanf(buf, "%s %llu", tok, periodp))
+ if (sscanf(buf, "%20s %llu", tok, periodp) < 1)
return -EINVAL;
*periodp *= NSEC_PER_USEC;
^ permalink raw reply related [flat|nested] 5+ messages in thread