From patchwork Wed Aug 31 12:39:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101892 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp313778qga; Wed, 31 Aug 2016 05:39:23 -0700 (PDT) X-Received: by 10.98.72.201 with SMTP id q70mr16472341pfi.159.1472647163864; Wed, 31 Aug 2016 05:39:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xu10si7099778pab.254.2016.08.31.05.39.21; Wed, 31 Aug 2016 05:39:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934077AbcHaMjS (ORCPT + 27 others); Wed, 31 Aug 2016 08:39:18 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50901 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932687AbcHaMjQ (ORCPT ); Wed, 31 Aug 2016 08:39:16 -0400 Received: from wuerfel.lan. ([176.7.54.107]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0MWvfk-1bZYSr1cOK-00Vxg4; Wed, 31 Aug 2016 14:39:05 +0200 From: Arnd Bergmann To: Trond Myklebust , Anna Schumaker Cc: netdev@vger.kernel.org, Arnd Bergmann , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] NFSv4.1: work around -Wmaybe-uninitialized warning Date: Wed, 31 Aug 2016 14:39:01 +0200 Message-Id: <20160831123911.3467676-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:WubVW5t1AcgB9y3U3dvfEEz+Yel2MFmDIRBsLASCKv7JyYmVk+V UElRmuoy3iiAIMzmEGKWoq9KDo2ORatIDXMFuAIg6B1EyClwEWUNFCc8rBfrFgXdvzh3hg7 /cUZ1zK9lTHriARwMMBvAp8Dem6/KOpZ6z40lPHzPYypwtZ5eurg3+hVLT/eYt2+EOSjjIg f7Nf1EKQnmhaXXNA90j9g== X-UI-Out-Filterresults: notjunk:1; V01:K0:gVuk7gPLAm4=:TVWVgLKL5GWJBjUk2A76ez PA+4sEl1iYy1m5MPjq+b2TozgwAAFGrMSegXr8OaSClJ509350l0nDhtmA7mYSmrdA0IiKVOw NVbNo469pAb893M+cZGBEw6cJ8xYeFXCpLSiwRZ4sUjlZ7V2+k5jRZL8ZdhzKNl9hZ10KiCPr qS5RX2dBxqSDmxBfv9oQIRiUp/FeDL1VDA1lh9yimGJ/NtlIbW2mv8OCbRVps2vRLVrLThw7A syZbBnWkqQUtplRBVxCb+uL59qPpe2FxKYzbAsYVBbCkUt/B4h9XvJEdHR9QmqDIbHoBVbQMo drfvy3E9YnH8z2qh/sCBoHlnmlludN43vH39c9KadjEe4AOMOmeED1veDzfzT7NitlBJfV7B+ rSjjiAc1H6n1UbQ7ndBAyCmhkKSVvn8FE8s1m3MNxvYX1PDgZnmMP6IO1rspnUEMHllxjPGc3 coEecVz5JTbEcBnMuoiQIee/KEibdcuzL2tj/FFxos0iO9L5VaGlawxE+tNXH9CfLslP39ib5 iT3DZRGCBbFYrJLMNhRNBigYWsjzWrcp4LJs7F86zeesP/sVu5DWhc6JLN6JA0Ey9unYFggzI 8bzeV0hUaw1Ss2NGDvpS7NnQdwNNZNWPtgL02jK95kSNy9OubuJ0JRRGcZmYTsXBmDYVv/w4e rmDAXBiPaGROGxscZwa1erOyxHbdbK+SuydAlU6S7lN2FphO0+hYtCCm/GidX9kBJjHo= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A bugfix introduced a harmless gcc warning in nfs4_slot_seqid_in_use: fs/nfs/nfs4session.c:203:54: error: 'cur_seq' may be used uninitialized in this function [-Werror=maybe-uninitialized] gcc is not smart enough to conclude that the IS_ERR/PTR_ERR pair results in a nonzero return value here. Using PTR_ERR_OR_ZERO() instead makes this clear to the compiler. Signed-off-by: Arnd Bergmann Fixes: e09c978aae5b ("NFSv4.1: Fix Oopsable condition in server callback races") --- fs/nfs/nfs4session.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) The patch that caused this just came in for v4.8-rc5. As the warning is now disabled by default and this is harmless, this can probably get queued for v4.9 instead. I mentioned earlier that I got the new warning for net-next, but failed to notice that it had come from mainline instead. -- 2.9.0 diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index b62973045a3e..150c5a1879bf 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c @@ -178,12 +178,14 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table *tbl, u32 slotid, __must_hold(&tbl->slot_tbl_lock) { struct nfs4_slot *slot; + int ret; slot = nfs4_lookup_slot(tbl, slotid); - if (IS_ERR(slot)) - return PTR_ERR(slot); - *seq_nr = slot->seq_nr; - return 0; + ret = PTR_ERR_OR_ZERO(slot); + if (!ret) + *seq_nr = slot->seq_nr; + + return ret; } /* From patchwork Wed Aug 31 12:39:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101891 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp314038qga; Wed, 31 Aug 2016 05:39:50 -0700 (PDT) X-Received: by 10.202.93.213 with SMTP id r204mr9193787oib.81.1472647190480; Wed, 31 Aug 2016 05:39:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s7si36781473ots.128.2016.08.31.05.39.49; Wed, 31 Aug 2016 05:39:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934124AbcHaMjp (ORCPT + 27 others); Wed, 31 Aug 2016 08:39:45 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:62299 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932687AbcHaMjn (ORCPT ); Wed, 31 Aug 2016 08:39:43 -0400 Received: from wuerfel.lan. ([176.7.54.107]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0MKdiF-1bdi1T2wD9-0020cp; Wed, 31 Aug 2016 14:39:33 +0200 From: Arnd Bergmann To: "David S. Miller" , David Howells Cc: netdev@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] rxrpc: fix undefined behavior in rxrpc_mark_call_released Date: Wed, 31 Aug 2016 14:39:02 +0200 Message-Id: <20160831123911.3467676-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160831123911.3467676-1-arnd@arndb.de> References: <20160831123911.3467676-1-arnd@arndb.de> X-Provags-ID: V03:K0:2mnR79RaZIqd9DpdpqUhmDfT6c55ei6me7RmdE4HXAuTwN93nD3 y8+ONSCKAAwIcvdzuQgMGLeWOksrXAPmGukLWoLYvoOB/e2coOjebYHHBTdhcRAG/2GuIEA 9NYZJDygNlWeOUlzpsKxPp2ABPUvUc87jnmdsTPcVabokpscBasrCg5J3YyWzailzhBOsuh Du/uQ1gLQFEyX2fIsCQgw== X-UI-Out-Filterresults: notjunk:1; V01:K0:MpB7eCQY70Y=:uOGkwlpKQVZ70pWI9BgFdt foU+pmWQLqi4LuC2Gg0MruwJlThZsFhpLUuKWB6w/ic1xJBakpOpCJoutMLdsQlB9wL+xzeKw ZvH4KaWlzBLc0KAUawXCvdy3l3GoDtQ7s/Sm/hJoU7wCdfsaEXpA3F4Vr/k+ZysNPpyN4A9Uo AImXcBClKfDetocKvtBshAzgcyLRlZmPAbDcXbwMlqT0zIZnrs4u8yZQKK+yYQ0STGHs22DtX g2YW9j9nhmbuWZQE1r1/GSU3Wgt8GYgK+APF9rbNB9mZLrxaQO5WYKeDZZmSi9DQbRnSTlVkL hcEP48d1Scai9okhWkPYsuQqntr9J+keCqBCxeIhfG667Lp2Cgb+FBBIGIxabOQcD9O7He1TJ CrEaoyKfoT/kRil4cDw60y5xEvpsfxZaKb949t966AS3rQ7KkU74ykHsYA9uI0XABcidwbmCb olCNJ31dXFHs+KMy8KzVwc7yi0lASplkqKIzlcrwGzuS8JpDlGAM+BSnr2RtfeaxtceVY7bfY 9td8glLWXDRyuBYchhjtNtBlDAyOaQZlzbMrxsJU+oOPm2ll50cl45oaxRbp0zHWp64Jm5Pqg oHDHEJ7gymWo8stARzqgzv/KL/M92arRVNV581Vhfa2XaD2yPpWxh9qwlNa8u32sUVPhyVDXv 4mAWAEJhHCSgRMp279GnseI89WuxmIJC/Fwlc8ZWXqqfYTpryoqnDW4eNV+HdEysdKng= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc -Wmaybe-initialized correctly points out a newly introduced bug through which we can end up calling rxrpc_queue_call() for a dead connection: net/rxrpc/call_object.c: In function 'rxrpc_mark_call_released': net/rxrpc/call_object.c:600:5: error: 'sched' may be used uninitialized in this function [-Werror=maybe-uninitialized] This sets the 'sched' variable to zero to restore the previous behavior. Signed-off-by: Arnd Bergmann Fixes: f5c17aaeb2ae ("rxrpc: Calls should only have one terminal state") --- net/rxrpc/call_object.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index 104ee8b1de06..2daec1eaec6f 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -595,6 +595,8 @@ static void rxrpc_mark_call_released(struct rxrpc_call *call) sched = __rxrpc_abort_call(call, RX_CALL_DEAD, ECONNRESET); if (!test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events)) sched = true; + } else { + sched = 0; } write_unlock(&call->state_lock); if (sched)