luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFC: nci: hci: Fix releasing uninitialized skbs

Browse Source 
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>
This commit is contained in:
Joe Perches 2015-05-31 17:44:45 -07:00 committed by Samuel Ortiz
parent 8a2151c587
commit 2622e2a03c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/nfc/nci/hci.c
View File

@ -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].gate,
ndev->hci_dev->init_data.gates[0].pipe); ndev->hci_dev->init_data.gates[0].pipe);
if (r < 0) if (r < 0)
goto exit; return r;
r = nci_hci_get_param(ndev, NCI_HCI_ADMIN_GATE, r = nci_hci_get_param(ndev, NCI_HCI_ADMIN_GATE,
NCI_HCI_ADMIN_PARAM_SESSION_IDENTITY, &skb); NCI_HCI_ADMIN_PARAM_SESSION_IDENTITY, &skb);
if (r < 0) if (r < 0)
goto exit; return r;
if (skb->len && if (skb->len &&
skb->len == strlen(ndev->hci_dev->init_data.session_id) && skb->len == strlen(ndev->hci_dev->init_data.session_id) &&
memcmp(ndev->hci_dev->init_data.session_id, !memcmp(ndev->hci_dev->init_data.session_id, skb->data, skb->len) &&
skb->data, skb->len) == 0 &&
ndev->ops->hci_load_session) { ndev->ops->hci_load_session) {
/* Restore gate<->pipe table from some proprietary location. */ /* Restore gate<->pipe table from some proprietary location. */
r = ndev->ops->hci_load_session(ndev); r = ndev->ops->hci_load_session(ndev);
if (r < 0)
goto exit;
} else { } else {
r = nci_hci_dev_connect_gates(ndev, r = nci_hci_dev_connect_gates(ndev,
ndev->hci_dev->init_data.gate_count, 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, ndev->hci_dev->init_data.session_id,
strlen(ndev->hci_dev->init_data.session_id)); strlen(ndev->hci_dev->init_data.session_id));
} }
if (r == 0)
goto exit;
exit: exit:
kfree_skb(skb); kfree_skb(skb);