diff options
| author |   Christophe Ricard <christophe.ricard@gmail.com> | 2015-08-19 21:26:42 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2015-08-20 21:56:36 +0200 |
| commit | 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 (patch) | |
| tree | c9c878e3ceac94069caa35f23869af463153213e /net/nfc/nci/hci.c | |
| parent | nfc: s3fwrn5: Add driver for Samsung S3FWRN5 NFC Chip (diff) | |
| download | linux-dev-5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118.tar.xz linux-dev-5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118.zip | |
nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter
skb can be NULL and may lead to a NULL pointer error.
Add a check condition before setting HCI rx buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/nfc/nci/hci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index af002df640c7..609f92283d1b 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -233,7 +233,7 @@ int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate, u8 cmd, r = nci_request(ndev, nci_hci_send_data_req, (unsigned long)&data, msecs_to_jiffies(NCI_DATA_TIMEOUT)); - if (r == NCI_STATUS_OK) + if (r == NCI_STATUS_OK && skb) *skb = conn_info->rx_skb; return r; |