diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-31 11:16:46 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 14:51:31 -0500 |
| commit | e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe (patch) | |
| tree | 5a92893b34d4d7ef1f1913c1113fbe5999b2e65b /net/nfc | |
| parent | c6d3b2046e310b361da93fe6c44bde5522c782da (diff) | |
| download | linux-stable-e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe.tar.gz linux-stable-e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe.tar.bz2 linux-stable-e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe.zip | |
NFC: llcp: integer underflow in nfc_llcp_set_remote_gb()
If gb_len is less than 3 it would cause an integer underflow and
possibly memory corruption in nfc_llcp_parse_gb_tlv().
I removed the old test for gb_len == 0. I also removed the test for
->remote_gb == NULL. It's not possible for ->remote_gb to be NULL and
we have already dereferenced ->remote_gb_len so it's too late to test.
The old test return -ENODEV but my test returns -EINVAL.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/llcp/llcp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c index 85bc75c38dea..746f5a2f9804 100644 --- a/net/nfc/llcp/llcp.c +++ b/net/nfc/llcp/llcp.c @@ -549,14 +549,13 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len) pr_err("No LLCP device\n"); return -ENODEV; } + if (gb_len < 3) + return -EINVAL; memset(local->remote_gb, 0, NFC_MAX_GT_LEN); memcpy(local->remote_gb, gb, gb_len); local->remote_gb_len = gb_len; - if (local->remote_gb == NULL || local->remote_gb_len == 0) - return -ENODEV; - if (memcmp(local->remote_gb, llcp_magic, 3)) { pr_err("MAC does not support LLCP\n"); return -EINVAL; |