rseq: Use pr_warn_once() when deprecated/unknown ABI flags are encountered
Subsystems (2)
Mathieu Desnoyers
maintainerPATCH 1/1 rseq: Use pr_warn_once() when deprecated/unknown ABI flags are encountered
These commits use WARN_ON_ONCE() and kill the offending processes when deprecated and unknown flags are encountered:
commit c17a6ff93213 ("rseq: Kill process when unknown flags are encountered in ABI structures") commit 0190e4198e47 ("rseq: Deprecate RSEQ_CS_FLAG_NO_RESTART_ON_* flags")
The WARN_ON_ONCE() triggered by userspace input prevents use of Syzkaller to fuzz the rseq system call.
Replace this WARN_ON_ONCE() by pr_warn_once() messages which contain actually useful information.
--- kernel/rseq.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
kernel/rseq.c +17 -2
@@ -171,12 +171,27 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)return 0 ; } +static bool rseq_warn_flags (const char *str,u32 flags) +{ +u32 test_flags; + +if (!flags) +return false; + test_flags = flags &RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Deprecated flags (%u) in %s ABI structure" , test_flags, str); + test_flags = flags & ~RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Unknown flags (%u) in %s ABI structure" , test_flags, str); +return true; +} +static int rseq_need_restart (struct task_struct *t,u32 cs_flags) {u32 flags, event_mask;int ret; -if (WARN_ON_ONCE (cs_flags &RSEQ_CS_NO_RESTART_FLAGS ) || cs_flags) +if (rseq_warn_flags ("rseq_cs" , cs_flags))return -EINVAL ;/* Get thread flags. */
@@ -184,7 +199,7 @@ static int rseq_need_restart(struct task_struct *t, u32 cs_flags)if (ret)return ret; -if (WARN_ON_ONCE (flags &RSEQ_CS_NO_RESTART_FLAGS ) || flags) +if (rseq_warn_flags ("rseq" , flags))return -EINVAL ;/*
Signature · 1 line
2.30.2
Quoted 9 lines · Mathieu Desnoyers
These commits use
WARN_ON_ONCE()and kill the offending processes when deprecated and unknown flags are encountered:commit
c17a6ff93213("rseq: Kill process when unknown flags are encountered in ABI structures") commit0190e4198e47("rseq: Deprecate RSEQ_CS_FLAG_NO_RESTART_ON_* flags")The
WARN_ON_ONCE()triggered by userspace input prevents use of Syzkaller to fuzz the rseq system call.
Quoted 7 lines
Replace this
WARN_ON_ONCE()bypr_warn_once()messages which contain actually useful information.Reported-by Mark Rutland <[email protected]>Signed-off-by Mathieu Desnoyers <[email protected]>Acked-by Mark Rutland <[email protected]>Acked-by Paul E. McKenney <[email protected]>
It would be nice ot have this merged; my Syzkaller runs are still hitting the WARN_ON_ONCE() periodically, preventing some useful fuzzing.
Is the plan still for this to go via -tip?
Thanks,
Mark.
Quoted 49 lines
--- kernel/rseq.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)kernel/rseq.c +17
-2@@ -171,12 +171,27 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)return 0 ; } +static bool rseq_warn_flags (const char *str,u32 flags) +{ +u32 test_flags; + +if (!flags) +return false; + test_flags = flags &RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Deprecated flags (%u) in %s ABI structure" , test_flags, str); + test_flags = flags & ~RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Unknown flags (%u) in %s ABI structure" , test_flags, str); +return true; +} +static int rseq_need_restart (struct task_struct *t,u32 cs_flags) {u32 flags, event_mask;int ret; -if (WARN_ON_ONCE (cs_flags &RSEQ_CS_NO_RESTART_FLAGS ) || cs_flags) +if (rseq_warn_flags ("rseq_cs" , cs_flags))return -EINVAL ;/* Get thread flags. */ @@ -184,7 +199,7 @@ static int rseq_need_restart(struct task_struct *t, u32 cs_flags)if (ret)return ret; -if (WARN_ON_ONCE (flags &RSEQ_CS_NO_RESTART_FLAGS ) || flags) +if (rseq_warn_flags ("rseq" , flags))return -EINVAL ;/* Signature · 1 line
2.30.2
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 448dca8c88755b768552e19bd1618be34ef6d1ff Gitweb: https://git.kernel.org/tip/448dca8c88755b768552e19bd1618be34ef6d1ff Author: Mathieu Desnoyers <[email protected]> AuthorDate: Wed, 02 Nov 2022 09:06:35 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 14 Nov 2022 09:58:32 +01:00
rseq: Use pr_warn_once() when deprecated/unknown ABI flags are encountered
These commits use WARN_ON_ONCE() and kill the offending processes when deprecated and unknown flags are encountered:
commit c17a6ff93213 ("rseq: Kill process when unknown flags are encountered in ABI structures") commit 0190e4198e47 ("rseq: Deprecate RSEQ_CS_FLAG_NO_RESTART_ON_* flags")
The WARN_ON_ONCE() triggered by userspace input prevents use of Syzkaller to fuzz the rseq system call.
Replace this WARN_ON_ONCE() by pr_warn_once() messages which contain actually useful information.
--- kernel/rseq.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
kernel/rseq.c +17 -2
@@ -171,12 +171,27 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)return 0 ; } +static bool rseq_warn_flags (const char *str,u32 flags) +{ +u32 test_flags; + +if (!flags) +return false; + test_flags = flags &RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Deprecated flags (%u) in %s ABI structure" , test_flags, str); + test_flags = flags & ~RSEQ_CS_NO_RESTART_FLAGS ; +if (test_flags) +pr_warn_once ("Unknown flags (%u) in %s ABI structure" , test_flags, str); +return true; +} +static int rseq_need_restart (struct task_struct *t,u32 cs_flags) {u32 flags, event_mask;int ret; -if (WARN_ON_ONCE (cs_flags &RSEQ_CS_NO_RESTART_FLAGS ) || cs_flags) +if (rseq_warn_flags ("rseq_cs" , cs_flags))return -EINVAL ;/* Get thread flags. */
@@ -184,7 +199,7 @@ static int rseq_need_restart(struct task_struct *t, u32 cs_flags)if (ret)return ret; -if (WARN_ON_ONCE (flags &RSEQ_CS_NO_RESTART_FLAGS ) || flags) +if (rseq_warn_flags ("rseq" , flags))return -EINVAL ;/*