evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: drop write-only stack variable

Browse source 
[ Upstream commit 3575dbf2cbbc8e598f17ec441aed526dbea0e1bd ]

Remove a write-only stack variable from unix_attach_fds(). This is a
left-over from the security fix in:

    commit 712f4aad406bb1ed67f3f98d04c044191f0ff593
    Author: willy tarreau <w@1wt.eu>
    Date:   Sun Jan 10 07:54:56 2016 +0100

        unix: properly account for FDs passed over unix sockets

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
David Herrmann 2016-02-02 18:17:54 +01:00 • committed by Greg Kroah-Hartman
parent 997a4944ce
commit ca4a744b18
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/unix/af_unix.c
View file

@ -1531,7 +1531,6 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)
{ {
int i; int i;
unsigned char max_level = 0; unsigned char max_level = 0;
int unix_sock_count = 0;
if (too_many_unix_fds(current)) if (too_many_unix_fds(current))
return -ETOOMANYREFS; return -ETOOMANYREFS;
@ -1539,11 +1538,9 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)
for (i = scm->fp->count - 1; i >= 0; i--) { for (i = scm->fp->count - 1; i >= 0; i--) {
struct sock *sk = unix_get_socket(scm->fp->fp[i]); struct sock *sk = unix_get_socket(scm->fp->fp[i]);
if (sk) { if (sk)
unix_sock_count++;
max_level = max(max_level, max_level = max(max_level,
unix_sk(sk)->recursion_level); unix_sk(sk)->recursion_level);
}
} }
if (unlikely(max_level > MAX_RECURSION_LEVEL)) if (unlikely(max_level > MAX_RECURSION_LEVEL))
return -ETOOMANYREFS; return -ETOOMANYREFS;