From patchwork Wed Mar 8 15:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sweet Tea Dorminy X-Patchwork-Id: 13166094 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACF5DC678D5 for ; Wed, 8 Mar 2023 16:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232474AbjCHQED (ORCPT ); Wed, 8 Mar 2023 11:04:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232151AbjCHQDp (ORCPT ); Wed, 8 Mar 2023 11:03:45 -0500 Received: from box.fidei.email (box.fidei.email [71.19.144.250]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07A8839B9D for ; Wed, 8 Mar 2023 08:01:54 -0800 (PST) Received: from authenticated-user (box.fidei.email [71.19.144.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.fidei.email (Postfix) with ESMTPSA id 05DC782477; Wed, 8 Mar 2023 11:01:11 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dorminy.me; s=mail; t=1678291272; bh=arlGtODBDc7cRV2joaGGPIkeR21yGPKb0z9yJBXHpKI=; h=From:To:Cc:Subject:Date:From; b=A/XWOhWQGj9U8xgn0mt5QgIo+dZqWdS110b6rgLncE61JInOE4zLluoLmni5T4/Wi zENYdWUOYoNjm+uyC1/AXZrQJ8uvFE0AsYfpqTeX52pKe24nJxGeEr4JYm8L+GzLi7 Ir7OdoCuLaJVncE0RtMmGZCoq0oTzcFprzNlP0Ti45hjPR01x0MGtMGN/uVdPNKVI8 y83UC5pRTxbGNWNAN76KahMTt97MdDNG9n5TD7GWO7I+mmuZd8wTOTiDtjU5XoLv9l 5Iq/X0ZXQQG2l1DYGl5/MUvti82DU5GqCOoRRNC/zfKcNFZRAuD2HDvZXVKRVoHu80 CEMOabfZVXbng== From: Sweet Tea Dorminy To: Chris Mason , Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org Cc: Sweet Tea Dorminy , Guenter Roeck Subject: [PATCH] btrfs: fix compilation error on sparc/parisc Date: Wed, 8 Mar 2023 10:58:36 -0500 Message-Id: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Commit 1ec49744ba83 ("btrfs: turn on -Wmaybe-uninitialized") exposed that on sparc and parisc, gcc is unaware that fscrypt_setup_filename() only returns negative error values or 0. This ultimately results in a maybe-uninitialized warning in btrfs_lookup_dentry(). Change to only return negative error values or 0 from fscrypt_setup_filename() at the relevant callsite, and assert that no positive error codes are returned (which would have wider implications involving other users). Reported-by: Guenter Roeck Link: https://lore.kernel.org/all/481b19b5-83a0-4793-b4fd-194ad7b978c3@roeck-us.net/ Signed-off-by: Sweet Tea Dorminy --- fs/btrfs/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 45102785c723..50178609f241 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5409,8 +5409,13 @@ static int btrfs_inode_by_name(struct btrfs_inode *dir, struct dentry *dentry, return -ENOMEM; ret = fscrypt_setup_filename(&dir->vfs_inode, &dentry->d_name, 1, &fname); - if (ret) + if (ret < 0) goto out; + /* + * fscrypt_setup_filename() should never return a positive value, but + * gcc on sparc/parisc thinks it can, so assert that doesn't happen. + */ + ASSERT(ret == 0); /* This needs to handle no-key deletions later on */