diff options
| author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2016-07-15 17:20:36 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-07 15:21:24 +0200 |
| commit | b3c5b399e6614c17c428e453e528b7c717edbf2c (patch) | |
| tree | acc0930b0658618c0c6c3e4535b2c890f8079b0e | |
| parent | b7d9885f97676b5b0c5162bd4720c1f956306813 (diff) | |
| download | lwn-b3c5b399e6614c17c428e453e528b7c717edbf2c.tar.gz lwn-b3c5b399e6614c17c428e453e528b7c717edbf2c.zip | |
cxl: fix potential NULL dereference in free_adapter()
commit 8fbaa51d43ef2c6a72849ec34060910723a0365f upstream.
If kzalloc() fails when allocating adapter->guest in
cxl_guest_init_adapter(), we call free_adapter() before erroring out.
free_adapter() in turn attempts to dereference adapter->guest, which in
this case is NULL.
In free_adapter(), skip the adapter->guest cleanup if adapter->guest is
NULL.
Fixes: 14baf4d9c739 ("cxl: Add guest-specific code")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/cxl/guest.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c index bc8d0b9870eb..df651935ed6f 100644 --- a/drivers/misc/cxl/guest.c +++ b/drivers/misc/cxl/guest.c @@ -1052,16 +1052,18 @@ static void free_adapter(struct cxl *adapter) struct irq_avail *cur; int i; - if (adapter->guest->irq_avail) { - for (i = 0; i < adapter->guest->irq_nranges; i++) { - cur = &adapter->guest->irq_avail[i]; - kfree(cur->bitmap); + if (adapter->guest) { + if (adapter->guest->irq_avail) { + for (i = 0; i < adapter->guest->irq_nranges; i++) { + cur = &adapter->guest->irq_avail[i]; + kfree(cur->bitmap); + } + kfree(adapter->guest->irq_avail); } - kfree(adapter->guest->irq_avail); + kfree(adapter->guest->status); + kfree(adapter->guest); } - kfree(adapter->guest->status); cxl_remove_adapter_nr(adapter); - kfree(adapter->guest); kfree(adapter); } |