diff options
| author | Suren Baghdasaryan <surenb@google.com> | 2017-08-17 16:30:47 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-09-18 21:14:30 +0100 |
| commit | 8b36e8c70a9e0d71d015448fefdf3e3bc5eb85e8 (patch) | |
| tree | bf716704fea93392ea7a58894f55a974d113f75c /drivers/nfc | |
| parent | e86be20135e3a33365ed38ce8626f88833cbdd83 (diff) | |
ANDROID: nfc: fdp: Fix possible buffer overflow in WCS4000 NFC driver
Possible buffer overflow when reading next_read_size bytes into
tmp buffer after next_read_size was extracted from a previous packet.
Bug: 62678828
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/fdp/i2c.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index a5d7332dfce5..2d043415f326 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -177,6 +177,16 @@ static int fdp_nci_i2c_read(struct fdp_i2c_phy *phy, struct sk_buff **skb) /* Packet that contains a length */ if (tmp[0] == 0 && tmp[1] == 0) { phy->next_read_size = (tmp[2] << 8) + tmp[3] + 3; + /* + * Ensure next_read_size does not exceed sizeof(tmp) + * for reading that many bytes during next iteration + */ + if (phy->next_read_size > FDP_NCI_I2C_MAX_PAYLOAD) { + dev_dbg(&client->dev, "%s: corrupted packet\n", + __func__); + phy->next_read_size = 5; + goto flush; + } } else { phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD; |