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 3E5C2188013; Tue, 30 Jul 2024 16:52:25 +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=1722358345; cv=none; b=SKkwbv3cAZjIb1AoHhrBDE2bqZjZzBjAEsbaBqtN5Uv+EQGOG9D+UHAb5ucHoMO+2lCA5dCK9ypmklpBQidzjMwn9Ve2hOdy9KnxOJrKDDH5Xpsuva5pC/E2uIQnwbVSuYiBBxaj46YYkbHaQu0AyE58FyLDFqHpVY7omCFmMuc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722358345; c=relaxed/simple; bh=6VDoPMfndl7okxi72wssqNDAO3b2KR+tVaVsomoe0lQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q+kPg7dbzICjSBK1CBHJl1HmhNrUpw2p+9DE41wmiXfvm4bIRipPqTeu2HZCF1ksmVbKVZFq1RRpSTascKId0o2GTDZ5Jdg9lFhvfgVvso3tqbVrdtO5pbBlhutVxMHxznrKzglDz1lqdpiC0zMRGAQbhSbkIEAbTPi/XobOl8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dyHU/LUy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dyHU/LUy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5C7CC32782; Tue, 30 Jul 2024 16:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722358345; bh=6VDoPMfndl7okxi72wssqNDAO3b2KR+tVaVsomoe0lQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dyHU/LUyVGZEfR+T2A0bG4DoMtXIGE96kpH89o+r8hdqqTdOkLxkW+xncbQvGtegD ASolqDtVJgGa3/fYuXgqGOq5a34AG8psRg656gYf2aqmAMypGaqxF8yHEG7xQUCAOq /Bt4n5Si4ROfIjpI2TCk5vpI5r2QXuh5JSaAZq78= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Carlos=20L=C3=B3pez?= , Stefan Haberland , Jens Axboe , Sasha Levin Subject: [PATCH 6.6 353/568] s390/dasd: fix error checks in dasd_copy_pair_store() Date: Tue, 30 Jul 2024 17:47:40 +0200 Message-ID: <20240730151653.664852689@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151639.792277039@linuxfoundation.org> References: <20240730151639.792277039@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Carlos López [ Upstream commit 8e64d2356cbc800b4cd0e3e614797f76bcf0cdb8 ] dasd_add_busid() can return an error via ERR_PTR() if an allocation fails. However, two callsites in dasd_copy_pair_store() do not check the result, potentially resulting in a NULL pointer dereference. Fix this by checking the result with IS_ERR() and returning the error up the stack. Fixes: a91ff09d39f9b ("s390/dasd: add copy pair setup") Signed-off-by: Carlos López Signed-off-by: Stefan Haberland Link: https://lore.kernel.org/r/20240715112434.2111291-3-sth@linux.ibm.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/s390/block/dasd_devmap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index c4e36650c4264..91522dba9fd98 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c @@ -2258,13 +2258,19 @@ static ssize_t dasd_copy_pair_store(struct device *dev, /* allocate primary devmap if needed */ prim_devmap = dasd_find_busid(prim_busid); - if (IS_ERR(prim_devmap)) + if (IS_ERR(prim_devmap)) { prim_devmap = dasd_add_busid(prim_busid, DASD_FEATURE_DEFAULT); + if (IS_ERR(prim_devmap)) + return PTR_ERR(prim_devmap); + } /* allocate secondary devmap if needed */ sec_devmap = dasd_find_busid(sec_busid); - if (IS_ERR(sec_devmap)) + if (IS_ERR(sec_devmap)) { sec_devmap = dasd_add_busid(sec_busid, DASD_FEATURE_DEFAULT); + if (IS_ERR(sec_devmap)) + return PTR_ERR(sec_devmap); + } /* setting copy relation is only allowed for offline secondary */ if (sec_devmap->device) -- 2.43.0