From mboxrd@z Thu Jan 1 00:00:00 1970 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 9D3EAC43334 for ; Tue, 14 Jun 2022 02:22:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353522AbiFNCV7 (ORCPT ); Mon, 13 Jun 2022 22:21:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353279AbiFNCPX (ORCPT ); Mon, 13 Jun 2022 22:15:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EC7D3616B; Mon, 13 Jun 2022 19:09:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DBBF860AD8; Tue, 14 Jun 2022 02:09:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 617BDC385A5; Tue, 14 Jun 2022 02:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655172557; bh=2WoKEsaIE0PMxojq0DMA1gG9fjx/03eR9RGT34/BisA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K8LSDO4dp4B5FJBLdDx4Qec4QrEttwnBlCWtJ4LfqaQK0fDGSsPCsaW8CasgtdSxx tzay+JwJEpzpYYgSAfEZZomW3njKOxKCU4a6HQXua36GfwFhyhLdNl/3nxLyHACpjn cW7xY2+hRpm22rGOVIsli529f6oRrYgnmeYg7qWWKk9wtDXw+K8IUtyiu5YTXweNjA CJdh9Xkyi8LUdGoumCOiv1otMxxkwKo0FLYUjjF7ey/Zog9ndADwiljma/yAyB8tO4 swuW6LkOGDqn3NYPB/8S3hBmPFoAbc8gGMJpHsq+/0RD5El0PWBpJqDkllvrRARwuh 997J+zHlKz/kg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergey Shtylyov , Damien Le Moal , Sasha Levin , tj@kernel.org, linux-ide@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 09/23] ata: libata-core: fix NULL pointer deref in ata_host_alloc_pinfo() Date: Mon, 13 Jun 2022 22:08:45 -0400 Message-Id: <20220614020900.1100401-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220614020900.1100401-1-sashal@kernel.org> References: <20220614020900.1100401-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Shtylyov [ Upstream commit bf476fe22aa1851bab4728e0c49025a6a0bea307 ] In an unlikely (and probably wrong?) case that the 'ppi' parameter of ata_host_alloc_pinfo() points to an array starting with a NULL pointer, there's going to be a kernel oops as the 'pi' local variable won't get reassigned from the initial value of NULL. Initialize 'pi' instead to '&ata_dummy_port_info' to fix the possible kernel oops for good... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- drivers/ata/libata-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index af8a1bac9345..fc37e075f3e1 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -6235,7 +6235,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev, const struct ata_port_info * const * ppi, int n_ports) { - const struct ata_port_info *pi; + const struct ata_port_info *pi = &ata_dummy_port_info; struct ata_host *host; int i, j; @@ -6243,7 +6243,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev, if (!host) return NULL; - for (i = 0, j = 0, pi = NULL; i < host->n_ports; i++) { + for (i = 0, j = 0; i < host->n_ports; i++) { struct ata_port *ap = host->ports[i]; if (ppi[j]) -- 2.35.1