Skip to contentSkip to conversation

fix two bugs in slic_card_init

PATCH In review David Matlack 2 participants 4 messages May 23, 2014 Staging

lore
Share & tools
lore
#0 lore raw

cover fix two bugs in slic_card_init

This patchset fixes two bugs in slic_card_init(). They are grouped in a series because the second patch depends on the first (for a merge without conflicts). In content, they are completely separate changes. They just touch a few of the same lines.

David Matlack (2):
staging: slicoss: fix dma memory leak
staging: slicoss: handle errors from slic_config_get

 drivers/staging/slicoss/slicoss.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
Signature · 1 line
1.9.2
#1 lore raw

PATCH 1/2 staging: slicoss: fix dma memory leak

Fix memory leak in slic_card_init. If the driver fails to poll for an interrupt after requesting config data from the device the dma memory is never freed.

---
This patch was originally sent here https://lkml.org/lkml/2014/5/6/7 with my google.com email address. But due to Google's recent change in DMARC policies, that patchset was silently dropped for at least some users (including my personal gmail account). So I'm sending it out now with my gmail.com account. Let me know if this is an issue. Thanks.

 drivers/staging/slicoss/slicoss.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/staging/slicoss/slicoss.c +3 -0
index e27b88f..5b82455 100644
@@ -3293,6 +3293,9 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 						&slic_regs->slic_isp, 0,
 						&slic_regs->slic_addr_upper,
 						0, FLUSH);
+					pci_free_consistent(adapter->pcidev,
+						sizeof(struct slic_eeprom),
+						peeprom, phys_config);
 					return -EINVAL;
 				}
 			}
Signature · 1 line
1.9.2
#2 lore raw

PATCH 2/2 staging: slicoss: handle errors from slic_config_get

In reply to David Matlack

slic_config_get() can fail. Change the return type from void to int and handle the error in slic_card_init(). So now, instead of silently failing (and then timing out waiting for the config data), the driver will fail loudly at request time.

---
 drivers/staging/slicoss/slicoss.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/staging/slicoss/slicoss.c +16 -12
index 5b82455..9c48cd8 100644
@@ -1140,14 +1140,10 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
 				adapter->upr_lock.flags);
 }
 
-static void slic_config_get(struct adapter *adapter, u32 config,
-							u32 config_h)
+static int slic_config_get(struct adapter *adapter, u32 config, u32 config_h)
 {
-	int status;
-
-	status = slic_upr_request(adapter,
-				  SLIC_UPR_RCONFIG,
-				  (u32) config, (u32) config_h, 0, 0);
+	return slic_upr_request(adapter, SLIC_UPR_RCONFIG, config, config_h,
+				0, 0);
 }
 
 /*
@@ -3262,7 +3258,12 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 		spin_unlock_irqrestore(&adapter->bit64reglock.lock,
 					adapter->bit64reglock.flags);
 
-		slic_config_get(adapter, phys_configl, phys_configh);
+		status = slic_config_get(adapter, phys_configl, phys_configh);
+		if (status) {
+			dev_err(&adapter->pcidev->dev,
+				"Failed to fetch config data from device.\n");
+			goto card_init_err;
+		}
 
 		for (;;) {
 			if (adapter->pshmem->isr) {
@@ -3293,10 +3294,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 						&slic_regs->slic_isp, 0,
 						&slic_regs->slic_addr_upper,
 						0, FLUSH);
-					pci_free_consistent(adapter->pcidev,
-						sizeof(struct slic_eeprom),
-						peeprom, phys_config);
-					return -EINVAL;
+					status = -EINVAL;
+					goto card_init_err;
 				}
 			}
 		}
@@ -3406,6 +3405,11 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 	card->reset_in_progress = 0;
 
 	return 0;
+
+card_init_err:
+	pci_free_consistent(adapter->pcidev, sizeof(struct slic_eeprom),
+			    peeprom, phys_config);
+	return status;
 }
 
 static void slic_init_driver(void)
Signature · 1 line
1.9.2
maintainer
#3 lore raw

Re: [PATCH 2/2] staging: slicoss: handle errors from slic_config_get

Quoted 9 lines · David Matlack

slic_config_get() can fail. Change the return type from void to int and handle the error in slic_card_init(). So now, instead of silently failing (and then timing out waiting for the config data), the driver will fail loudly at request time.

---
 drivers/staging/slicoss/slicoss.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

It looks like I had already applied patch 1/2 here, but not this one, odd.

Anyway, I've applied this, and should be synced up with you now. If I have missed applying anything, please resend.

thanks,

greg k-h