Re: [GIT PULL] ucount fixes for v5.15

[Eric W. Biederman]

Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:

> On Thu, Oct 21, 2021 at 6:04 AM Eric W. Biederman <ebiederm@xxxxxxxxxxxx> wrote:
>>
>>  kernel/cred.c                | 9 ++++-----
>>  security/keys/process_keys.c | 8 ++++++++
>>  2 files changed, 12 insertions(+), 5 deletions(-)
>
> That's not remotely the right diffstat.
>
> What's going on?

Sigh.  I sent the diffstat from when I sent the additional patches
out for review instead of the diffstat for the entire branch I was
asking you to pull.

I really should have named things differently on my end when I sent
the additional changes out for review.

The correct diffstat should have been.

 include/linux/user_namespace.h |  2 ++
 kernel/cred.c                  |  9 ++++----
 kernel/signal.c                | 25 ++++++---------------
 kernel/ucount.c                | 49 ++++++++++++++++++++++++++++++++++++++++++
 security/keys/process_keys.c   |  8 +++++++
 5 files changed, 69 insertions(+), 24 deletions(-)


> The shortlog was correct, and I pulled the branch, because everything
> else looked ok, but that diffstat in the pull request was some
> complete fantasy.
>
> If I were to guess, I think the diffstat may be everything _but_ that
> first ("ucounts: Fix signal ucount refcounting") fix. I just don't see
> how/why you'd get that as part of the pull request.

You are exactly right.

My apologies for the confusion.
Eric