From: Jon Mason <jon.mason@intel.com>
Date: Mon, 15 Jul 2013 20:23:47 +0000 (-0700)
Subject: NTB: Add Error Handling in ntb_device_setup
X-Git-Tag: v3.12-rc1~99^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b12a0d15bd1559e72ad21d9d807fd2a6706f0ab;p=kernel%2Fkernel-generic.git

NTB: Add Error Handling in ntb_device_setup

If an error is encountered in ntb_device_setup, it is possible that the
spci_cmd isn't populated.  Writes to the offset can result in a NULL
pointer dereference.  This issue is easily encountered by running in
NTB-RP mode, as it currently is not supported and will generate an
error.  To get around this issue, return if an error is encountered
prior to attempting to write to the spci_cmd offset.

Signed-off-by: Jon Mason <jon.mason@intel.com>
---

diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index 2dacd19..515099e 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -644,10 +644,13 @@ static int ntb_device_setup(struct ntb_device *ndev)
 		rc = -ENODEV;
 	}
 
+	if (rc)
+		return rc;
+
 	/* Enable Bus Master and Memory Space on the secondary side */
 	writew(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER, ndev->reg_ofs.spci_cmd);
 
-	return rc;
+	return 0;
 }
 
 static void ntb_device_free(struct ntb_device *ndev)