mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ata: libata-core: fix NULL pointer deref in ata_host_alloc_pinfo()

Browse Source 
[ Upstream commit bf476fe22a ]

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 <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sergey Shtylyov
2022-05-21 23:34:10 +03:00
committed by Greg Kroah-Hartman
parent 440b2a62da
commit 36cd19e7d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/libata-core.c
View File

@@ -5475,7 +5475,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,
const struct ata_port_info * const * ppi, const struct ata_port_info * const * ppi,
int n_ports) int n_ports)
{ {
const struct ata_port_info *pi; const struct ata_port_info *pi = &ata_dummy_port_info;
struct ata_host *host; struct ata_host *host;
int i, j; int i, j;
@@ -5483,7 +5483,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,
if (!host) if (!host)
return NULL; 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]; struct ata_port *ap = host->ports[i];
if (ppi[j]) if (ppi[j])