Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp807079ybg; Tue, 28 Jul 2020 20:48:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPYkN4pGNA4BXOG75nP0zOtUynAh1nc7Wx0vU2jGuD1P9rmbC9C5fAONyyByvKBeJr2kzz X-Received: by 2002:a17:906:138b:: with SMTP id f11mr26007825ejc.310.1595994491817; Tue, 28 Jul 2020 20:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595994491; cv=none; d=google.com; s=arc-20160816; b=I2gGtszHVMJjIZTZGq9n7Zw4Uv8kSHJkKP+95RMCttIokfIv8qjwxVOZ3/a1pj0LSw JfpRX7m0gBgqfW3XeCZY/ytG1ohvxZaenBadzmP34K7QPZYxKYUw6WTTBCibRnO6uSdR PyufoHTg2HwZaqnSy3kC8LeuzZI/K0VzGZ6Ie838x+p9Y5ONn4CEuARKlw90yDiLmUsW AsE6IYb0ZHl45tgWPsUzjdlwMrF0JBynO/EhD/B9ul7xgGGzHfyvGW3QMShiy+gY8kxR /YbgH3yAWnIyFsRh27ucXdVtG6xf/yEk/2MXookUVV+LhUvwzDTvpEvva0r2A/H+oTqL wJlw== 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=qXDrB0hO8YTccLoA1C+iBYMrIIeok02METUzZpKNj8E=; b=C9gpT78CS+301FuMaE3/75ABOqBEUjg+E/MWOef7us/eltFNt1JVC5gIP4isEuMkj+ srjPnFtAyk/hWmoAdaBnYxQyKLy7KCaJNr4FbOcJpNogoCB6budXMFrj1xq53L1IaexO TZKDXtWDhKBVwLJZ9yFoN7wxVNLx4Q/uaWLPM3I6AuXHOXzZVMeClY419RGm0JvaNruK hsfOLbvgxi4XA4VakqsBlY9sgGPbbGcdyE9VUe+eN6CtsuNw+Vx0pd2xVPR03o2bzxkb zjY5MOzV+9Kqh1PFpsz4zs4jawL71o3/SF0ejymh40yTkqoMG0fySQeQqhyx/fkHcAMJ exzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n12si291880eji.301.2020.07.28.20.47.49; Tue, 28 Jul 2020 20:48:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726842AbgG2Dos (ORCPT + 99 others); Tue, 28 Jul 2020 23:44:48 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:52800 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726245AbgG2Dos (ORCPT ); Tue, 28 Jul 2020 23:44:48 -0400 X-IronPort-AV: E=Sophos;i="5.75,408,1589212800"; d="scan'208";a="97041138" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Jul 2020 11:44:42 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 0B1834CE38CB; Wed, 29 Jul 2020 11:44:38 +0800 (CST) Received: from G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 29 Jul 2020 11:44:37 +0800 Received: from localhost.localdomain (10.167.225.206) by G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jul 2020 11:44:37 +0800 From: Hao Li To: CC: , , , , , , Subject: [PATCH] dax: Fix wrong error-number passed into xas_set_err() Date: Wed, 29 Jul 2020 11:44:36 +0800 Message-ID: <20200729034436.24267-1-lihao2018.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-yoursite-MailScanner-ID: 0B1834CE38CB.A1DB9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lihao2018.fnst@cn.fujitsu.com X-Spam-Status: No Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The error-number passed into xas_set_err() should be negative. Otherwise, the xas_error() will return 0, and grab_mapping_entry() will return the found entry instead of a SIGBUS error when the entry is not a value. And then, the subsequent code path would be wrong. Signed-off-by: Hao Li --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 11b16729b86f..acac675fe7a6 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -488,7 +488,7 @@ static void *grab_mapping_entry(struct xa_state *xas, if (dax_is_conflict(entry)) goto fallback; if (!xa_is_value(entry)) { - xas_set_err(xas, EIO); + xas_set_err(xas, -EIO); goto out_unlock; } -- 2.28.0