Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Ross Philipson <ross.philipson@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org
Cc:     ross.philipson@oracle.com, dpsmith@apertussolutions.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        luto@amacapital.net, dave.hansen@linux.intel.com,
        kanth.ghatraju@oracle.com, trenchboot-devel@googlegroups.com
Subject: [PATCH 2/2] x86: Check return values from early_ioremap calls
Date:   Fri, 15 Apr 2022 11:10:01 -0400
Message-Id: <1650035401-22855-3-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1650035401-22855-1-git-send-email-ross.philipson@oracle.com>
References: <1650035401-22855-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XCupZZsr3BYZiuBKnvjKMcF+WAK4Ai65D6lisPXx4YSKzxN2QpsbXFmadTjv?=
 =?us-ascii?Q?0q7ZRE8Ffwo8ip5dtYARnIC8VAEG/SMnaR7gigQ7NJHgADs0ywIhOSf+DkYS?=
 =?us-ascii?Q?/elDSxKDxIVk6DjiyszuANehORL5NEdiVMqA5BW9B0pDhAl7W6LVS0D8Mg/a?=
 =?us-ascii?Q?vauwePT+sq0lAj43ugC3s2xrO9RBUu+2PmKnvspRSChEZ+DgHgynONgJermg?=
 =?us-ascii?Q?5JymjjKoLLaMK8ueNiC+6ZasMFr6tQPXbQdSwq3sRx0bMH+JWN4OYmCFABMa?=
 =?us-ascii?Q?R0QRUSPM/XYVNGiJtBcvpKXtoMFpWKpc3g9N/RM7DIN19s0KTXxTCsbNWVdn?=
 =?us-ascii?Q?mRLU3keH97XXIPPtV/sCebkLmXgD/MK1TPoKFIaXdb1LgAk8zaP2Ra/XkxP0?=
 =?us-ascii?Q?s0ptkFdvPJMsA1zlwYIge7hEwWLNKlkhDUN1UNJWKhViMDm7zmldsE02XaB9?=
 =?us-ascii?Q?8MoIDDTpaiQw6N6JZ1buiHslDVdPugYar/2RbcYygF1hySZgdfxzl1xXyBoP?=
 =?us-ascii?Q?THmIifYe3f7QkhWpf4x+IR9l1hB/TqLzMaa27EOeu+I/nFiYx2auITEwHAWb?=
 =?us-ascii?Q?sff0BnddB5taIXeBGwUGtbNRArO/+mAOJF2IgEz3EGz9ta3bGi727YnnlcpP?=
 =?us-ascii?Q?FjEEhfVHDzKDJce33D0MsJgJJkYf495YeKpkalAvx69A3S7/vY8e1sLhSKwA?=
 =?us-ascii?Q?m14UGPLbSMRxLQL1Hrd3ZK3GjEWZ1aJmevtvW51hcT7BRWG1+uzW3iyRFboT?=
 =?us-ascii?Q?jqJXJS95AyoXhBSgVIhKLjQp5tT48Wworl/7RJtS38LZyBjOGff2W9YTSqgK?=
 =?us-ascii?Q?qINZVwg/mmaoXjqKnHcfvhEXc3+BvcDgaGRlt8ueTQIn+UGyXGVuTC1Tx5lx?=
 =?us-ascii?Q?a+Hupj83zfS4sCswsyXHB1QyMtmNl3DlhngXzH4RowQ4lsemLPELus0Uonru?=
 =?us-ascii?Q?MC9ADu0bK9dGzkIFw/cWfgPwLwxNXwp6udD37pvUccGsMeNWxtCrwkKAC7iV?=
 =?us-ascii?Q?AgEvnuCF+XyRP9hCt25t2pHrtABZPdL3O7Sqmmv0GeE/IS6bUFXEJ0iEhaeB?=
 =?us-ascii?Q?WuJLKsPZn5zAjPd2CPSGdKuhpz/hRpffQ7rlsJX5rUswKrTFcL/wF7I5/XA5?=
 =?us-ascii?Q?Nm1bygOTjRPaNBO66NXy5wTj/81yvyn9cQGXbvDQdWp6XvHEiBcvCbhUCtTp?=
 =?us-ascii?Q?kIqWR99cQ9XYPd7nYk6bhbZKJw78rHV2OYbOQAeW230tcLBr6XYUiruFz+DU?=
 =?us-ascii?Q?8PrQbD9Fp9JP6vAdWnajr6fifRLL6wdPbkB/pbSiB4omzTatM0dsMiEHHwAG?=
 =?us-ascii?Q?QLrsjXYe/hbltXhVuvNpqezd9cKNhFeHjYfU9j74soxl88TWBYxWUpX8mlOp?=
 =?us-ascii?Q?y0T3mc7gcxVrtPHOB3hHPipPeVtyxNf4KHzBiND1FObVbk1KFS3XmgveeXjc?=
 =?us-ascii?Q?iPVZVTaITsWkdwPNh5TgCHPak4O4um+krYL3ZR7O0g1U/XxViFoNDcglUFC1?=
 =?us-ascii?Q?sjfA3tFj1GuehIp3wfPdylwdIbuGVnbkOswsN6YcKZyUYSI2nmiCXo7bDRsG?=
 =?us-ascii?Q?QuY9AqrSdjx2tno4Yr2HC46MawX0O6YYXgxUJlAVFJgZ9fyLD/6/1gWoXqbn?=
 =?us-ascii?Q?19Finwg/bDjAqkM3SdxVXhZuSsg2fyflXXa1J2hlL1JMrDqJgQ0cDdeURabH?=
 =?us-ascii?Q?4HWXkr6outssDBP1KbsEJmyS0X1MmFj5uH0z1ihdFfzFCQW33zO6XDipYbbA?=
 =?us-ascii?Q?O+RtdlmFvwvMDZcoIL4m7geydMCIUJ4=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 050bf248-ee49-4b83-a79f-08da1ef2e941
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 15:16:27.2221
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BbpbsWgNSLm9lYfEWXrRPyQ1nWY385Ze5ts/9SLR5DYGVwIYz9wDg/AUUugZ5kdLXLSVCQdBufCRfGziaNCvtmQ9SESAHKLY42K1l3QD0kI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5854
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-15_01:2022-04-14,2022-04-15 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204150090
X-Proofpoint-ORIG-GUID: wmmEQ_nyM3YdpkJeuJbgJsTcMGKg5EVO
X-Proofpoint-GUID: wmmEQ_nyM3YdpkJeuJbgJsTcMGKg5EVO
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There are a number of places where early_ioremap is called
but the return pointer is not checked for NULL. The call
can result in a NULL being returned so the checks must
be added.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/kernel/apic/x2apic_uv_x.c | 2 ++
 arch/x86/kernel/early_printk.c     | 2 ++
 arch/x86/kernel/vsmp_64.c          | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index f5a48e6..7a64287 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -75,6 +75,8 @@ static unsigned long __init uv_early_read_mmr(unsigned long addr)
 	unsigned long val, *mmr;
 
 	mmr = early_ioremap(UV_LOCAL_MMR_BASE | addr, sizeof(*mmr));
+	if (!mmr)
+		panic("UV: error: failed to ioremap MMR\n");
 	val = *mmr;
 	early_iounmap(mmr, sizeof(*mmr));
 
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 68b3892..35b228d 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -290,6 +290,8 @@ static __init void early_pci_serial_init(char *s)
 		/* WARNING! assuming the address is always in the first 4G */
 		early_serial_base =
 			(unsigned long)early_ioremap(bar0 & 0xfffffff0, 0x10);
+		if (!early_serial_base)
+			panic("early_serial: failed to ioremap MMIO BAR\n");
 		write_pci_config(bus, slot, func, PCI_COMMAND,
 						cmdreg|PCI_COMMAND_MEMORY);
 	}
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 796cfaa..39769f4 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -32,6 +32,9 @@ static void __init set_vsmp_ctl(void)
 	/* set vSMP magic bits to indicate vSMP capable kernel */
 	cfg = read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0);
 	address = early_ioremap(cfg, 8);
+	if (WARN_ON(!address))
+		return;
+
 	cap = readl(address);
 	ctl = readl(address + 4);
 	printk(KERN_INFO "vSMP CTL: capabilities:0x%08x  control:0x%08x\n",
-- 
1.8.3.1