diff options
| author | Joe Perches <joe@perches.com> | 2015-05-31 17:44:45 -0700 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-06-09 00:34:19 +0200 |
| commit | 2622e2a03cd7320f57a4f5171c242dccdab035dd (patch) | |
| tree | 7cf56686031b93f5476841aeac444de9bf920a6f /net/nfc/nci | |
| parent | 8a2151c587715e84af676ee6c210fd41b912de76 (diff) | |
| download | linux-2622e2a03cd7320f57a4f5171c242dccdab035dd.tar.gz linux-2622e2a03cd7320f57a4f5171c242dccdab035dd.tar.bz2 linux-2622e2a03cd7320f57a4f5171c242dccdab035dd.zip | |
NFC: nci: hci: Fix releasing uninitialized skbs
Several of these goto exit; uses should be direct returns
as skb is not yet initialized by nci_hci_get_param().
Miscellanea:
o Use !memcmp instead of memcmp() == 0
o Remove unnecessary goto from if () {... goto exit;} else {...} exit:
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/hci.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index ed54ec533836..af002df640c7 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -639,22 +639,19 @@ int nci_hci_dev_session_init(struct nci_dev *ndev) ndev->hci_dev->init_data.gates[0].gate, ndev->hci_dev->init_data.gates[0].pipe); if (r < 0) - goto exit; + return r; r = nci_hci_get_param(ndev, NCI_HCI_ADMIN_GATE, NCI_HCI_ADMIN_PARAM_SESSION_IDENTITY, &skb); if (r < 0) - goto exit; + return r; if (skb->len && skb->len == strlen(ndev->hci_dev->init_data.session_id) && - memcmp(ndev->hci_dev->init_data.session_id, - skb->data, skb->len) == 0 && + !memcmp(ndev->hci_dev->init_data.session_id, skb->data, skb->len) && ndev->ops->hci_load_session) { /* Restore gate<->pipe table from some proprietary location. */ r = ndev->ops->hci_load_session(ndev); - if (r < 0) - goto exit; } else { r = nci_hci_dev_connect_gates(ndev, ndev->hci_dev->init_data.gate_count, @@ -667,8 +664,6 @@ int nci_hci_dev_session_init(struct nci_dev *ndev) ndev->hci_dev->init_data.session_id, strlen(ndev->hci_dev->init_data.session_id)); } - if (r == 0) - goto exit; exit: kfree_skb(skb); |