From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 10 Jul 2017 14:00:48 +0000 (+0800)
Subject: crypto: af_alg - Avoid sock_graft call warning
X-Git-Tag: v4.1.12-124.31.3~898
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3aa9f20902c5b7a6326a72a4756f11cddd31253a;p=users%2Fjedix%2Flinux-maple.git

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>
(cherry picked from commit 2acce6aa9f6569d4e135b2c4cfb56acce95efaeb)

Orabug: 26895616,27426147

Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 3cb08d00c31d..30c48b223db9 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -284,7 +284,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
 		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);