2021-08-31 10:05:15

by Christian Brauner

[permalink] [raw]
Subject: [GIT PULL] sys fixes

Hi Linus,

/* Summary */
This contains a single fix to set_user() which aligns permission checks with
the corresponding fork() codepath. Noone involved in this could come up with a
reason for the difference. A capable caller can already circumvent the check
when they fork where the permission checks are already for the relevant
capabilities in addition to also allowing to exceed nproc when it is the init
user. Apply the same logic to set_user().

(In case any question come up I'll be on vacation next week so responding might
take a while.)

/* Testing */
All patches are based on v5.14-rc5 and have been sitting in linux-next. No
build failures or warnings were observed. All old and new tests are passing.

/* Conflicts */
At the time of creating this PR no merge conflicts were reported from
linux-next and no merge conflicts showed up doing a test-merge with current
mainline.

The following changes since commit 36a21d51725af2ce0700c6ebcb6b9594aac658a6:

Linux 5.14-rc5 (2021-08-08 13:49:31 -0700)

are available in the Git repository at:

[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/kernel.sys.v5.15

for you to fetch changes up to 2863643fb8b92291a7e97ba46e342f1163595fa8:

set_user: add capability check when rlimit(RLIMIT_NPROC) exceeds (2021-08-12 14:54:25 +0200)

Please consider pulling these changes from the signed kernel.sys.v5.15 tag.

Thanks!
Christian

----------------------------------------------------------------
kernel.sys.v5.15

----------------------------------------------------------------
Ran Xiaokai (1):
set_user: add capability check when rlimit(RLIMIT_NPROC) exceeds

kernel/sys.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)


2021-08-31 19:55:01

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] sys fixes

The pull request you sent on Tue, 31 Aug 2021 12:03:26 +0200:

> [email protected]:pub/scm/linux/kernel/git/brauner/linux tags/kernel.sys.v5.15

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e55f0c439a2681a3c299bedd99ebe998049fa508

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

2021-08-31 21:40:59

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] sys fixes

On Tue, Aug 31, 2021 at 3:03 AM Christian Brauner
<[email protected]> wrote:
>
> This contains a single fix to set_user() which aligns permission checks with
> the corresponding fork() codepath.

Pulled.

That single commit is odd, though. It has strange formatting, it got
the first-line summary rule wrong, and it has the "cc:" list
corruption that should just have been fixed up.

Not any real problems, but sloppy editing that I started looking at
because the one-liner shortlog didn't make sense.

Linus

2021-09-01 09:25:36

by Christian Brauner

[permalink] [raw]
Subject: Re: [GIT PULL] sys fixes

On Tue, Aug 31, 2021 at 12:23:57PM -0700, Linus Torvalds wrote:
> On Tue, Aug 31, 2021 at 3:03 AM Christian Brauner
> <[email protected]> wrote:
> >
> > This contains a single fix to set_user() which aligns permission checks with
> > the corresponding fork() codepath.
>
> Pulled.
>
> That single commit is odd, though. It has strange formatting, it got
> the first-line summary rule wrong, and it has the "cc:" list
> corruption that should just have been fixed up.
>
> Not any real problems, but sloppy editing that I started looking at
> because the one-liner shortlog didn't make sense.

Hm, sorry about that. It seems that my git am scripts for b4 might be
getting in the way of older scripts. Strange. That won't happen again.