summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-04-01 02:34:02 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2014-04-22 02:37:29 +0400
commite8efab6e6bad1bb116bb9dfa6e0f65dd1bb9cc0e (patch)
tree8cacae1fd7633d12fbf7a5c394fdf7764f3e570a /drivers/nfc
parent74157ef54c57b2bfbb267c6b8e25f85e01e4b8bb (diff)
downloadlinux-e8efab6e6bad1bb116bb9dfa6e0f65dd1bb9cc0e.tar.xz
NFC: st21nfca: Fix warning: array subscript is above array bounds
Fix "warning: array subscript is above array bounds" in load_session Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st21nfca/st21nfca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
index 32d5e8742ee8..d9fe09ea26a5 100644
--- a/drivers/nfc/st21nfca/st21nfca.c
+++ b/drivers/nfc/st21nfca/st21nfca.c
@@ -167,14 +167,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
* - destination hid (1byte)
* - destination gid (1byte)
*/
- info = (struct st21nfca_pipe_info *)
- skb_pipe_info->data;
+ info = (struct st21nfca_pipe_info *) skb_pipe_info->data;
for (j = 0; (j < ARRAY_SIZE(st21nfca_gates)) &&
(st21nfca_gates[j].gate != info->dst_gate_id);
j++)
;
- if (st21nfca_gates[j].gate == info->dst_gate_id &&
+ if (j < ARRAY_SIZE(st21nfca_gates) &&
+ st21nfca_gates[j].gate == info->dst_gate_id &&
ST21NFCA_DM_IS_PIPE_OPEN(info->pipe_state)) {
st21nfca_gates[j].pipe = pipe_info[2];
hdev->gate2pipe[st21nfca_gates[j].gate] =