Skip to content

Commit

Permalink
Networking
Browse files Browse the repository at this point in the history
crypto: af_alg - Avoid sock_graft call warning

The newly added sock_graft warning triggers in af_alg_accept.
It's harmless as we're essentially doing sock->sk = sock->sk.

The sock_graft call is actually redundant because all the work
it does is subsumed by sock_init_data.  However, it was added
to placate SELinux as it uses it to initialise its internal state.

This patch avoisd the warning by making the SELinux call directly.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
herbertx committed Jul 12, 2017
1 parent 7459e1d commit 2acce6a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/af_alg.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern)
goto unlock;

sock_init_data(newsock, sk2);
sock_graft(sk2, newsock);
security_sock_graft(sk2, newsock);
security_sk_clone(sk, sk2);

err = type->accept(ask->private, sk2);
Expand Down

0 comments on commit 2acce6a

Please sign in to comment.