From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mat Martineau Subject: [PATCH net-next] tcp: md5: Handle RCU dereference of md5sig_info Date: Thu, 21 Dec 2017 10:29:10 -0800 Message-ID: <20171221182910.4785-2-mathew.j.martineau@linux.intel.com> References: <20171221182910.4785-1-mathew.j.martineau@linux.intel.com> Cc: Mat Martineau To: netdev@vger.kernel.org Return-path: Received: from mga03.intel.com ([134.134.136.65]:33538 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbdLUS3W (ORCPT ); Thu, 21 Dec 2017 13:29:22 -0500 In-Reply-To: <20171221182910.4785-1-mathew.j.martineau@linux.intel.com> Sender: netdev-owner@vger.kernel.org List-ID: Dereference tp->md5sig_info in tcp_v4_destroy_sock() the same way it is done in the adjacent call to tcp_clear_md5_list(). Resolves this sparse warning: net/ipv4/tcp_ipv4.c:1914:17: warning: incorrect type in argument 1 (different address spaces) net/ipv4/tcp_ipv4.c:1914:17: expected struct callback_head *head net/ipv4/tcp_ipv4.c:1914:17: got struct callback_head [noderef] * Signed-off-by: Mat Martineau --- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index dd945b114215..5d203248123e 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1911,7 +1911,7 @@ void tcp_v4_destroy_sock(struct sock *sk) /* Clean up the MD5 key list, if any */ if (tp->md5sig_info) { tcp_clear_md5_list(sk); - kfree_rcu(tp->md5sig_info, rcu); + kfree_rcu(rcu_dereference_protected(tp->md5sig_info, 1), rcu); tp->md5sig_info = NULL; } #endif -- 2.15.1