Received: by 10.192.165.156 with SMTP id m28csp1046293imm; Wed, 18 Apr 2018 03:07:29 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Toml+0QOm72C0fXtwNaCdKeMc/AddKJBJXhFMtnksFx8YAWl830fa5gAZ6t2Tfis+Ug/t X-Received: by 2002:a17:902:71cc:: with SMTP id t12-v6mr1511470plm.247.1524046049297; Wed, 18 Apr 2018 03:07:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524046049; cv=none; d=google.com; s=arc-20160816; b=i07ouoQ9fqco8MKO9/pcF5p4cJEQ9fPPARDywPF8DCADNMXg1ol3SDk43N3pJR5Bvs mYSDA5bxY+AbHt1nfzYwqgu0on31xOfDk9ShraL5t42YswIMWR1RgLq0ZSRPo7uJCfzJ b30hvJOwpCYn6sUedTxzF4oB8mIGaHPmOyYMuKaA+L8U1AuGJZpYEizrNudg0J48e95k 7BnAhHS3xqPZ+yMnkcH3Hm3VnhbLb4Ig2cz21fPvjYiWWs7OOmsnVcw3P58/r/1E5O17 hNo00Om5ohZO6k5CV2Hki+WCCkStRIKBD4WPrSIDhVwNKTXx+6ahD6jXRtZ4zc7sQi5R DcPg== 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=wbOvJBSe764NC2XrEYrDNC12MLUlfvQ2oDL0Y0/jkWfhYE6oCod3mUl919XueTItLO owHaIriNqLHyqrKrlD+iiO8iwqbn5a4HP7E/2ZBbqk5OK28eEYe7xJ3l+f/WNctaj+HI bS+oXTZNRYM9ja3XKaJ9Iqqn5DxSq8zMRlqxe9GGhUyVj46bcMudkbuCzT8MwhelPoYM kW91HRpr7JoPmKbW0OZwKcNjbKC0C+OTNgsfKAkt6NuuNSDpNeMPsw10QcO5g+FtCSo/ LAb3BTIrRKN8Bp9T0Tg2f6V6xbHjyPWWREcXjMdwzoxF35cUono54bmWlFBwoQaPP5Wo uWhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f4ScOL+k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 f15si829825pgu.662.2018.04.18.03.07.14; Wed, 18 Apr 2018 03:07:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=f4ScOL+k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1753394AbeDRKFm (ORCPT + 99 others); Wed, 18 Apr 2018 06:05:42 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:41766 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753190AbeDRKF2 (ORCPT ); Wed, 18 Apr 2018 06:05:28 -0400 Received: by mail-pg0-f68.google.com with SMTP id e13so629707pgq.8 for ; Wed, 18 Apr 2018 03:05:28 -0700 (PDT) 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=f4ScOL+kvsB1n2oHrfxVv7siv3wGHJzKQlab2ujoKM5bBCjc+vd79n3HDdSDM+P6Hp gPVgUYJtiRATXiFEv4omAat3hkGhHbwHoHKFXG2cnHVzU1SISvSR5YZLHvltIrk3Kv93 /xJqnQjFCQklk5b/HUG2RXJNccwlozf68YxsE= 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=QJ0yVkg3uWd4hMOL4rpTkJxo5Qpgg/w8c58Gl75j+0T8Wuxld8+V3WCjc1UjKrwRsf gFKOIlz5htaCnu272cdK8TV9kNhWGvEWI8DHcMsQIBDvgMGyXmv1SOYXQ3w3LcWbLZ0b 273WtkyjUItNYquFN7kxJyDwS65MIpIjmkDq1BOKwVUX++IK3iK+bzGmPoVyLRhexUZZ fO8ywCA7npU42OxYDfm7hiVtrINPAbfA5BUEzI/G0sjb6+Czmui5wH9Y7umvAbPMoyBO 6ZWi4dyCU4eKJ+NeS6+mROcwYmWs16W7/Y1XVKIdzBFimraxQkt1c0CiQ1IQbXuiLobJ v1Rg== X-Gm-Message-State: ALQs6tDsVcpaZu8yk7mPOYhQ7lDobphktifGDeG4miYFgsrFWyuyvTCi 8sm9i4v3+wnIXjD8T0PjvBsgf6WCq/k= X-Received: by 10.99.125.78 with SMTP id m14mr1231947pgn.190.1524045927437; Wed, 18 Apr 2018 03:05:27 -0700 (PDT) Received: from localhost.localdomain ([106.51.17.69]) by smtp.gmail.com with ESMTPSA id z16sm1970298pfn.101.2018.04.18.03.05.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Apr 2018 03:05:26 -0700 (PDT) From: Amit Pundir To: lkml , linux-wireless@vger.kernel.org Cc: Samuel Ortiz , Christophe Ricard , Andy Shevchenko , Greg KH , John Stultz , Dmitry Shmidt , Todd Kjos , Android Kernel Team , Suren Baghdasaryan Subject: [RESEND][PATCH 4/4] NFC: fdp: Fix possible buffer overflow in WCS4000 NFC driver Date: Wed, 18 Apr 2018 15:35:04 +0530 Message-Id: <1524045904-7005-5-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524045904-7005-1-git-send-email-amit.pundir@linaro.org> References: <1524045904-7005-1-git-send-email-amit.pundir@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(+) 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; -- 2.7.4