From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754086AbcHZPek (ORCPT ); Fri, 26 Aug 2016 11:34:40 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53410 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753029AbcHZPei (ORCPT ); Fri, 26 Aug 2016 11:34:38 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Arnd Bergmann , David Howells , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH 3/5] rxrpc: fix last_call processing Date: Fri, 26 Aug 2016 17:25:44 +0200 Message-Id: <20160826152546.604384-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160826152546.604384-1-arnd@arndb.de> References: <20160826152546.604384-1-arnd@arndb.de> X-Provags-ID: V03:K0:Rgk8TcoZwEa6YtbWWXGrtiTMtuGdinFnQfgbiUao5k0ozO1XsO4 u+DDuH6zcx0XpXemN7i59y6DI9HczXTR3gLUoU2shToZoU9NONRrE6ofXYm7+rJD2tZgcSz t0z0/YCgs3zir/mlBFNirH5Z+Zr21fEV0lYmGE3/KNC9SruLtHztUdUWdVvuBq+wAC5WHQ+ T2cKrFPuoYIkJLeEeGVnQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:TyOOgU707YI=:XSr1pxkiceQ6Ljj89sKe6/ RG9WaqI1o+Zd5CUSvKRb7cKc/IHdnkzQ09pi+qLzg4CMFfLB86WV3FvfjLp4mIozOanrXRDob hC6cPjxApjwM4PgErCGPSOFs7nMRBn8mJWUPdhzuqJh5L7vqr/BrvVVxl6QfGPxOylCUrWQ8T 9mhO1KnZxkLX+d63zFQBrKP07+zFZuRnJOHXeMHhkS818ASnMhqrx0aAzzfzdx517Q1is7e+L DBAgntsGjHj3DqrXra2IfHmDCRAeCUqPD0uYV1IVkuUPbnjaPU++C1jI1dgguZDywPPwAIuoC ITDYr8FYleaOaCXm1vtLkCsbrjGXL4wlPxXGCjdoP31hvFnRTSzlMpAb1t8fjjUmo4jBw2t2P piTn8qGb1+XQUHMLTWGCrlPpPVfjNKBsNJ9PDSyX4F4ixfG3TTx/Ksa+v8G8odktxx1n4DUK8 r//2eQm/L6Gp0iQmtUKKgTMs1pKrBW0Wy4IgRiajaDrpZg0p0Mfhi6Ljn9/8+9kAmxrVs4dCk zq+vM5XCU87TOArTYaAJOS0teW9tsPJfNGfCd1DN8VGAZfZqVEGNSHIHUZlzEQpNhmMka4elF lXhUFXKljJGVNRIwECYSWRMo+189WQ56/YMu3ThvDNtpViCZPUf1HSrA6P5t9VvKDBQJMBC4z E9R8BtHB3FqoGFpKkgVYkKc4889VP/ox5zWENF1R4m9m+mg+Iz0NYZgxyHseDPPrRN0E= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A change to the retransmission handling in rxrpc caused a use-before-init bug in rxrpc_data_ready(), as indicated by "gcc -Wmaybe-uninitialized": net/rxrpc/input.c: In function 'rxrpc_data_ready': net/rxrpc/input.c:735:34: error: 'call' may be used uninitialized in this function [-Werror=maybe-uninitialized] This moves the initialization of the local variable before the first user, which presumably is what was intended here. Signed-off-by: Arnd Bergmann Fixes: 18bfeba50dfd ("rxrpc: Perform terminal call ACK/ABORT retransmission from conn processor") --- Cc: David Howells Cc: "David S. Miller" Cc: netdev@vger.kernel.org net/rxrpc/input.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 66cdeb56f44f..3c22e43a58fd 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -728,6 +728,10 @@ void rxrpc_data_ready(struct sock *sk) if (sp->hdr.callNumber < chan->last_call) goto discard_unlock; + call = rcu_dereference(chan->call); + if (!call || atomic_read(&call->usage) == 0) + goto cant_route_call; + if (sp->hdr.callNumber == chan->last_call) { /* For the previous service call, if completed * successfully, we discard all further packets. @@ -744,10 +748,6 @@ void rxrpc_data_ready(struct sock *sk) goto out_unlock; } - call = rcu_dereference(chan->call); - if (!call || atomic_read(&call->usage) == 0) - goto cant_route_call; - rxrpc_post_packet_to_call(call, skb); goto out_unlock; } -- 2.9.0