diff options
| author | Mark Brown <broonie@kernel.org> | 2020-08-25 11:01:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-25 11:01:58 +0100 |
| commit | 3485e56cb8e618d9cb7e74db3606c00d818d1a0d (patch) | |
| tree | e7e8c42082e40bfe2c3eebbfed23bf1bbde3f4d9 /kernel/entry/common.c | |
| parent | c8b2c8949c45b01d75237331fc1387036b952d58 (diff) | |
| parent | d012a7190fc1fd72ed48911e77ca97ba4521bccd (diff) | |
Merge tag 'v5.9-rc2' into regulator-5.10
Linux 5.9-rc2
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 9852e0d62d95..fcae019158ca 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -65,7 +65,8 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall, syscall_enter_audit(regs, syscall); - return ret ? : syscall; + /* The above might have changed the syscall number */ + return ret ? : syscall_get_nr(current, regs); } noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall) |