git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drop-time' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
[pandora-kernel.git]
/
drivers
/
nfc
/
pn533.c
diff --git
a/drivers/nfc/pn533.c
b/drivers/nfc/pn533.c
index
3df19e6
..
cf1a87b
100644
(file)
--- a/
drivers/nfc/pn533.c
+++ b/
drivers/nfc/pn533.c
@@
-521,6
+521,9
@@
static bool pn533_acr122_is_rx_frame_valid(void *_frame, struct pn533 *dev)
if (frame->ccid.type != 0x83)
return false;
+ if (!frame->ccid.datalen)
+ return false;
+
if (frame->data[frame->ccid.datalen - 2] == 0x63)
return false;