Skip to content

Commit 448dca8

Browse files
compudjPeter Zijlstra
authored andcommitted
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 c17a6ff ("rseq: Kill process when unknown flags are encountered in ABI structures") commit 0190e41 ("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. Reported-by: Mark Rutland <[email protected]> Signed-off-by: Mathieu Desnoyers <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Mark Rutland <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 094226a commit 448dca8

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

kernel/rseq.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,35 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs)
171171
return 0;
172172
}
173173

174+
static bool rseq_warn_flags(const char *str, u32 flags)
175+
{
176+
u32 test_flags;
177+
178+
if (!flags)
179+
return false;
180+
test_flags = flags & RSEQ_CS_NO_RESTART_FLAGS;
181+
if (test_flags)
182+
pr_warn_once("Deprecated flags (%u) in %s ABI structure", test_flags, str);
183+
test_flags = flags & ~RSEQ_CS_NO_RESTART_FLAGS;
184+
if (test_flags)
185+
pr_warn_once("Unknown flags (%u) in %s ABI structure", test_flags, str);
186+
return true;
187+
}
188+
174189
static int rseq_need_restart(struct task_struct *t, u32 cs_flags)
175190
{
176191
u32 flags, event_mask;
177192
int ret;
178193

179-
if (WARN_ON_ONCE(cs_flags & RSEQ_CS_NO_RESTART_FLAGS) || cs_flags)
194+
if (rseq_warn_flags("rseq_cs", cs_flags))
180195
return -EINVAL;
181196

182197
/* Get thread flags. */
183198
ret = get_user(flags, &t->rseq->flags);
184199
if (ret)
185200
return ret;
186201

187-
if (WARN_ON_ONCE(flags & RSEQ_CS_NO_RESTART_FLAGS) || flags)
202+
if (rseq_warn_flags("rseq", flags))
188203
return -EINVAL;
189204

190205
/*

0 commit comments

Comments
 (0)