cxl: fix potential NULL dereference in free_adapter()

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>

diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
index ee7148e78ca78188265cf593b85e6336f29b81e1..9aa58a77a24d13f102546a9c45aa48d780326364 100644 (file)
--- a/drivers/misc/cxl/guest.c
+++ b/drivers/misc/cxl/guest.c
@@ -1055,16 +1055,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);
 }