diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-04-01 10:08:18 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-04-01 10:08:18 +0200 |
| commit | b82779648dfd3814df4e381f086326ec70fd791f (patch) | |
| tree | 59868a9860d907e232275d7a5a667e91213e6aa9 /fs/exec.c | |
| parent | fe19aab844ad76a4e001082f633b1ac34f2a943d (diff) | |
| parent | 39cd87c4eb2b893354f3b850f916353f2658ae6f (diff) | |
Merge tag 'v6.9-rc2' into media_stage
Linux 6.9-rc2
This is needed to pull in commit 11763a8598f88 ("fs/9p: fix uaf in
in v9fs_stat2inode_dotl"), which fixes the broken virtme. With this
fix the media regression tests can be run again without crashing.
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index ff6f26671cfc..cf1df7f16e55 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -895,6 +895,7 @@ int transfer_args_to_stack(struct linux_binprm *bprm, goto out; } + bprm->exec += *sp_location - MAX_ARG_PAGES * PAGE_SIZE; *sp_location = sp; out: |