From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28376492510; Sat, 28 Feb 2026 17:44:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300649; cv=none; b=mWE6pHZIwHNdQ6TRlnZTsJxm7E7NIOwHttT4DDejA6va5daPjKFLDfcrRX7yCmH2fz79iZFi8N9bb9vtK8IBA3ShrkuM3LePF8Pz4VzYNdUb1dHjb5y7zo0bXvD+h7SUBZ5EUzRcgRmYpkYdSDjV94ej+NVhq3NUOlWMBzZcR2g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300649; c=relaxed/simple; bh=/kb3/CN4l+J4R7vK+W4oMij34Pk/nldAKDkkXdUCpEg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhmfnqSwaAvAglBXCJkMsZjA5YLa+d9kQ+FL2rnQM3ATO97RaaLlC4Nwjq3vW9i8oqLCSH+oXdKTzNq5N0OiM+zl34/vznsOvUa6dtnZy9aCyvhO2u4vqph+w1Dd2IOlqEbMeiGpKb/eGv1yiU+j9ts8tGqjKM6nrpt+0A4f4VM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aizzmWZt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aizzmWZt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AA1BC19424; Sat, 28 Feb 2026 17:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300649; bh=/kb3/CN4l+J4R7vK+W4oMij34Pk/nldAKDkkXdUCpEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aizzmWZtUK3P5d8IhxD85pPXmYXTeVURrs0TroovgE4cFqIdykdvL/V9WwnGLlWvI E/aY55vfAX+ogZm1/RIVyeuEXw1DDYMwqAAKXQ84OdwrFlGNrDRmfpolZYc7JfWYtS cgcQ27+3KuO0OofDrWC77GelrmirePRRaxiAn/p4d6s3flHczXLl8r8z8cSyyCSx27 Czqq9FKeu6EjeznSTlsLgYrFtXNiRXGqjem47tQZVkO6KoJnTixUwKGhIiXCVK2ytO 1ANx7SlSx3CVGwcJKNYm4GXq6WgGhIi8aZwLcIPjIMjg8zlAVvlYBBNTF8e1LU323K DvDPtIHvnFwZw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , r772577952@gmail.com, Christoph Hellwig , Sasha Levin Subject: [PATCH 6.19 690/844] xfs: check return value of xchk_scrub_create_subord Date: Sat, 28 Feb 2026 12:30:03 -0500 Message-ID: <20260228173244.1509663-691-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: "Darrick J. Wong" [ Upstream commit ca27313fb3f23e4ac18532ede4ec1c7cc5814c4a ] Fix this function to return NULL instead of a mangled ENOMEM, then fix the callers to actually check for a null pointer and return ENOMEM. Most of the corrections here are for code merged between 6.2 and 6.10. Cc: r772577952@gmail.com Cc: # v6.12 Fixes: 1a5f6e08d4e379 ("xfs: create subordinate scrub contexts for xchk_metadata_inode_subtype") Signed-off-by: "Darrick J. Wong" Reviewed-by: Christoph Hellwig Tested-by: Jiaming Zhang Signed-off-by: Sasha Levin --- fs/xfs/scrub/common.c | 3 +++ fs/xfs/scrub/repair.c | 3 +++ fs/xfs/scrub/scrub.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 5f9be4151d722..ebabf3b620a2c 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -1399,6 +1399,9 @@ xchk_metadata_inode_subtype( int error; sub = xchk_scrub_create_subord(sc, scrub_type); + if (!sub) + return -ENOMEM; + error = sub->sc.ops->scrub(&sub->sc); xchk_scrub_free_subord(sub); return error; diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c index efd5a7ccdf624..4d45d39e67f11 100644 --- a/fs/xfs/scrub/repair.c +++ b/fs/xfs/scrub/repair.c @@ -1136,6 +1136,9 @@ xrep_metadata_inode_subtype( * setup/teardown routines. */ sub = xchk_scrub_create_subord(sc, scrub_type); + if (!sub) + return -ENOMEM; + error = sub->sc.ops->scrub(&sub->sc); if (error) goto out; diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c index 3c3b0d25006ff..c312f0a672e65 100644 --- a/fs/xfs/scrub/scrub.c +++ b/fs/xfs/scrub/scrub.c @@ -634,7 +634,7 @@ xchk_scrub_create_subord( sub = kzalloc(sizeof(*sub), XCHK_GFP_FLAGS); if (!sub) - return ERR_PTR(-ENOMEM); + return NULL; sub->old_smtype = sc->sm->sm_type; sub->old_smflags = sc->sm->sm_flags; -- 2.51.0