From patchwork Mon Jun 17 12:39:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 167008 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2812663ilk; Mon, 17 Jun 2019 05:40:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMMOaBqPKVstCJsAphgyZ0pA3i4by3Lbt4Fi9ZQ2B3i1bk8/Rjo6nj3oLLSxN2Q0TQxoPn X-Received: by 2002:a63:490b:: with SMTP id w11mr11914296pga.127.1560775212404; Mon, 17 Jun 2019 05:40:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560775212; cv=none; d=google.com; s=arc-20160816; b=wKBM3TalQ6jiRhC2eGXCXX4wDStBj8DGvjiZFPDpbfneItONhIYyX5hvT3OAW7cCW7 wxRbgevYdbuZmjoMBwRO0gHjCYBgKwaL/Yz15bR8Z/3RIH0k3DX2rVD366xZeoJ50wfG yeD3xTNYzSZIvlVFJ7wj3YDhp6kw2KOeKc/VUyXrJEGiQArZTn+bxwT1aW5dBJtECSmF Pu6DuMA6PyHbXH3BYiTU0xDSy+aCASfgxc31rGa850yr5Vy2ZwKnmH4TfTAx6KQ2rn8G XeTbhFPzoszcLqRyjJL60zqyVYgz+PkrGLMvPWIAuZPkRU9EgLZafkBtHt0YQgwAagLr Pzpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=K21jDMK47zrYPYVYnQmxgPlpC7t7M6W07pK16v4pnk8=; b=jqqplY/ORigjOM1kIpy4rtn0ZOpyRJSYd7XuDyy6XmM7lMrM230i109nhLRTDZqeU5 FePm5qv95DNLEwrgAMvGSw8oFP2tt5sl0wDtmw69uFf4e4K8HNVRAvNplbHOM840Weei 9HL7uP93FbJtoRWHNYufUjKI0qN/2/0Up0IcrfuA86QHJVUFXVGiqTNLHr2WXAqRiw/0 OWh1IoNPb3qrazF+8vmoF+T6wUHzxJhd+4lnLYnmNl8nh00OdWLVbqUrIJLybSdxLGgV XPh10FJRlpJlVn19psFx1CFXugu7uZ9psOVAy0ZGeQJLyxPf7XrFl4Or2zd8/iUOMjA2 Lxgw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q195si10649061pgq.119.2019.06.17.05.40.12; Mon, 17 Jun 2019 05:40:12 -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 S1727722AbfFQMkK (ORCPT + 27 others); Mon, 17 Jun 2019 08:40:10 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:56871 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727394AbfFQMkJ (ORCPT ); Mon, 17 Jun 2019 08:40:09 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1My3In-1iYGfA14mt-00zT27; Mon, 17 Jun 2019 14:39:51 +0200 From: Arnd Bergmann To: Miklos Szeredi Cc: Arnd Bergmann , syzbot+9c69c282adc4edd2b540@syzkaller.appspotmail.com, Amir Goldstein , Miklos Szeredi , Vivek Goyal , linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ovl: fix bogus -Wmaybe-unitialized warning Date: Mon, 17 Jun 2019 14:39:29 +0200 Message-Id: <20190617123947.941417-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:VMmghNLouvOr+K+bfJY6ktXiz4LQF0Tgkc4VipMMdMlj5hSYiFF Kuz66NlT5mfIqkDPhs0INSQ6W5g7xUrO2VsXRfwdGPxJOsGvfzMD+KQu0gn6YEeyv4ZocKA giMzsF6/brReIyLfXmyw+qIqq1isbPE3LsIeV1zF2HP56PR9ww3lPYirQ+nC8kFYr+g0ooB ijAEtaOXzCcbLycDzSvmg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:2GlMJfBsJmw=:TbCQHBQlR61T4n2//VMNhP uQrwe3wS78ihWQNEXlV2DpY6WUp3/2RaICX+TzXcILt0j0WWfXItn1YP4zGhLbtHYLdHaf4T7 u7OHs+uSiYmveKvqpKHUsBYv1SntgZFaeeElviUYU/WCeg11R0KnLngxfMHY7z1NzbNXfQqAn cRhQEYphUVlq4Nib+DJng2SWY+PU5g2WpjKzn1itu3zi8Yo61ZwXnzbcx2beK2x9VuScJFP1c 6zxplSj8LgRCoBX+xpL7BtWQcWna7Mw5P1fOs7EuaQcZ68agqXssjSm4MWkTiC1A0nw3tDqoh m3B+WWb1WHexcmq24f2pCWEDkqDr6QUq63Ljs5KUEjojK/tENLCwfictWEMIUdu4J5XdxdKq0 BDIQuj/Sng8Gpy9iJdGBDNKafgECoI045CtLN+X73Ml+z8CA1V2AMbikvE8GK66I3W1KFU8Vf 2MwR2ydLQj7RbcjvH46VcUaM4lweB+cLzQegTnZtZg+fHfbRGIjTalQwdjg3YNsx47bBtkHMn xpnkWWyJSC39/MTMZo9BDN9vFMkLNrPX4ObkMHHHyalEZYnULbWoT7S5GvlC6E4EhALXYx1HM 1+bVB4aJi05SkI/IyzR3olWI3a7/+CPZhZejqI8baKLkO247QlCXYsYOHjPlutjmVHiIDqjR5 DRO9D1wupUxQdG7IbxNDlaZ1sQdTwfcUmCtLhpNLyoq3W3/hL9kpnaVEn2ky23FFZIG5vqZJu eRqfNfdtlcvh55d/3Ei3CxEH2OPWgcb29gz2Tw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc gets a bit confused by the logic in ovl_setup_trap() and can't figure out whether the local 'trap' variable in the caller was initialized or not: fs/overlayfs/super.c: In function 'ovl_fill_super': fs/overlayfs/super.c:1333:4: error: 'trap' may be used uninitialized in this function [-Werror=maybe-uninitialized] iput(trap); ^~~~~~~~~~ fs/overlayfs/super.c:1312:17: note: 'trap' was declared here Reword slightly to make it easier for the compiler to understand. Fixes: 146d62e5a586 ("ovl: detect overlapping layers") Signed-off-by: Arnd Bergmann --- fs/overlayfs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.0 diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 746ea36f3171..d150ad6dba94 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -995,8 +995,8 @@ static int ovl_setup_trap(struct super_block *sb, struct dentry *dir, int err; trap = ovl_get_trap_inode(sb, dir); - err = PTR_ERR(trap); - if (IS_ERR(trap)) { + err = PTR_ERR_OR_ZERO(trap); + if (err) { if (err == -ELOOP) pr_err("overlayfs: conflicting %s path\n", name); return err;