From patchwork Wed Dec 20 19:51:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 122493 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6023611qgn; Wed, 20 Dec 2017 11:51:53 -0800 (PST) X-Google-Smtp-Source: ACJfBov8GuzVF32u2BadcJKQUkKkqi4l92WprfaKiClU/vVjBEZiZjnr8uMFXueMICegiAiSkBbT X-Received: by 10.84.215.2 with SMTP id k2mr7972227pli.60.1513799513700; Wed, 20 Dec 2017 11:51:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513799513; cv=none; d=google.com; s=arc-20160816; b=NRWfyxF+Fm835qZ5NE+exV2rvR4fU2xxX70z4HN/eomybrI32koVR7S4jXwnBebgqZ BwRoGsSp5937VPqISIdMvBkIviBLftbfOI0SAYO/1LS/bcGiG7EVWIjjSgl3fQzLP2nt NpYSybKnPpK/1Xcw1XPRIk+I6WwhuEGbKoK2y/45HU/kV/O0LtPqhc7YNn1HpYvCoQZ1 cKZUUdLArlOBlN06KNH91QM+Da/z2Nu/tViuhGHhGsL95TaUgwN2SD45ik/8DJD71pH7 ZPwBwrY6m/maAh55EhQsUGju7+FTLXS/n1rjAmAimJil8PTmB8y00m0Gs2dVYbMu7e0B GjRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=TZBj15vhcZkL16Ta0GEOKA6YFvs3QXuieY8qcfuQ2Dg=; b=oLcN9knIuQElfy1GoYsG/KTm3UNiYzPtLDOolHMuPhZOFd9KTJqiddEFyvVp4N0NMZ 2BKlLtanraxz6XFS5LWL/QO1URbZLCPN//DXUGhL5pjmYsRArsNLm0q0dEl+gsNbOAbR QhAnk+cgZ3nA3qaFFrtA/qG6foVsuYtzxQnvRBkhqG3I+0dSRgSYq/YT8GicQynfzmQg DCBYNnhMYaIUGZCDKjIfysRYtxYEhWwnw0dd64Fosl4j73bwmkHCecmOO2T1/TDYpY/Z P1NosrutumBws7kEKN+RfB0cb0rhQaORCVy2TmKcOEl+4Ea3SNIog/FV5h2Z/sgxEKBD OtLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q3SGWrIP; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i9si12288544pgs.523.2017.12.20.11.51.53; Wed, 20 Dec 2017 11:51:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q3SGWrIP; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756552AbdLTTvv (ORCPT + 2 others); Wed, 20 Dec 2017 14:51:51 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35644 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756774AbdLTTvr (ORCPT ); Wed, 20 Dec 2017 14:51:47 -0500 Received: by mail-pf0-f193.google.com with SMTP id j124so12995487pfc.2 for ; Wed, 20 Dec 2017 11:51:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TZBj15vhcZkL16Ta0GEOKA6YFvs3QXuieY8qcfuQ2Dg=; b=Q3SGWrIP5PNIWoVuBNRAsp8M9VTBLhmgqVRe9Dcqt96Nxw2YjJJgqc2Gx56VTsRRlW uo7uJ2GkbBuBn7VvHb7oSiGQGZLKV5+tBk3S5S06acutcx/00ipwPI/BZI08ndoh1ob4 5zTd6mR9hqdTahXjuRCYc25nZ95k23+Oxajoc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TZBj15vhcZkL16Ta0GEOKA6YFvs3QXuieY8qcfuQ2Dg=; b=rvA82/I2eH3kGUb1AkUZliueKuGzYZrV1XB6LJwPW3I1UYYUJRles7zniWcBpx/VgW Wk7lIQnDhlcdwxYio6y0OUGQf94JQ4XI6AYjhsft38J20MueGgM5wmcKvj3c26tnkdJc z9jNO/Dz9h71NSrViUlLIftNeQoIVXtsrCyFEm1CKBbtw+c1ldHPPCu+J+wbWl5v1qbO 8HSug0DuQV4ijRAxG+1uV2U0SpRpTIKSqHX8FO9j7Fh0ZUrOQ+l/nzL3jptMhfRMf6cF C5ppPbFe9FyyedYhELX+PL8W21pQMmRKmJZkW8P51u4BRakOATh3EFmRa2JmB1nBwkBU 4oXw== X-Gm-Message-State: AKGB3mIGpANSTH+YdQlMhvw3uipvjN2tIF6+PPLWuLikXyGyuixiSjy2 g0TWCWIu45koHyl/ele0tjHgJg== X-Received: by 10.99.117.12 with SMTP id q12mr7407819pgc.412.1513799506827; Wed, 20 Dec 2017 11:51:46 -0800 (PST) Received: from localhost.localdomain ([106.51.17.191]) by smtp.gmail.com with ESMTPSA id g2sm36715867pfc.130.2017.12.20.11.51.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Dec 2017 11:51:45 -0800 (PST) From: Amit Pundir To: lkml , linux-wireless@vger.kernel.org Cc: Suren Baghdasaryan , Samuel Ortiz , Christophe Ricard , Andy Shevchenko , John Stultz , Dmitry Shmidt , Todd Kjos , Android Kernel Team Subject: [RFC][PATCH 4/4] NFC: fdp: Fix possible buffer overflow in WCS4000 NFC driver Date: Thu, 21 Dec 2017 01:21:24 +0530 Message-Id: <1513799484-12505-5-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513799484-12505-1-git-send-email-amit.pundir@linaro.org> References: <1513799484-12505-1-git-send-email-amit.pundir@linaro.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Suren Baghdasaryan Possible buffer overflow when reading next_read_size bytes into tmp buffer after next_read_size was extracted from a previous packet. Signed-off-by: Suren Baghdasaryan Signed-off-by: Amit Pundir --- drivers/nfc/fdp/i2c.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4 diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index c4da50e07bbc..08a4f82a2965 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -176,6 +176,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;