From patchwork Thu May 3 18:38:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 134917 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2255899lji; Thu, 3 May 2018 11:39:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZohBuVqaHPLyGs4TGWfqvX1Yu7S4MCkqL270pNRciM80HgPJouve5jhvs5eq1C+0j1louY/ X-Received: by 2002:a17:902:6ac3:: with SMTP id i3-v6mr14634908plt.378.1525372745151; Thu, 03 May 2018 11:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525372745; cv=none; d=google.com; s=arc-20160816; b=tnllhxENsdhXzwoeIf0SEDCsG8NI2yoKtK0/b346IxO+Kzwn7kIrlHfpo2gcE2Yhla C2BeH4ZFBUmpXMz+/MUTHaGkUHb5brBje5dRsyYsQhiTk5X1qXawNCBmOoubRnkr29a4 JPQoa41FC6JRwGvEeGHb9S4UH9unAazcQyg1WRqRWbmT+fdmORb8/xUEZPW5Mb7aBpTO st73Cttgq1yCxDbWeizqQjP/a9w8DoZmZM58M6DXYXR8UUxfQLqYUruESp7yYdA9ryNn EoERsZRhlF9wG/uJEJIpTl09B2Nmh1q5zvI95yB43CkON+XxTryV84ghqOfHZM7Cw+uR 7IcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=aZuHMnS8HoYQvymWT9toB6eMu7hXaR3HCblMyZn8Yd8=; b=ZyyJOpO6uE2xoCIjoyMpvXZOzQr3lzzYHKWJc/eC3oEbVTQNEpEPKhIKY4vpze/+ue 8UogEHRoc0BtOH7gDFc7d0SWR3zL+ldA0G+0s27vjGQGFXR3f1b8jwg7wEcz0kGf10XO WUJ+ph+RXv+60cnPa38CD3JK4UViO2IUZlPMZ6YaX1sqzVkols6KFGqNL+7SQnMx8/ka VBA+MTSr/60pCZ1mDfa7ld7ghfTKbNkl+1PwhwiNcVsiNXAXZM8KFHHoqJTCwcAyRRIP fS8y0omviZObIqE68SRhtg47G6jIG5KcQzyeMAeOfDk7ALDHyEsmV/cDCqHrruYKa5g2 j/ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AFrJSQ3g; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 v190si13208082pfb.324.2018.05.03.11.39.04; Thu, 03 May 2018 11:39:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=AFrJSQ3g; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1751236AbeECSjE (ORCPT + 11 others); Thu, 3 May 2018 14:39:04 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39740 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbeECSjC (ORCPT ); Thu, 3 May 2018 14:39:02 -0400 Received: by mail-pf0-f194.google.com with SMTP id a22so1308902pfn.6 for ; Thu, 03 May 2018 11:39:02 -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; bh=aZuHMnS8HoYQvymWT9toB6eMu7hXaR3HCblMyZn8Yd8=; b=AFrJSQ3g/0LEig40pCkgJBvQ97ub/yxdTMQMssKjZx4DN79hEkvqrCPpcVw2T3eq3Q Ef2wkiYwai7EzotwNhm+0x5YUoU3IfrQBWITitILNDFgEkKQc3sXu50p6NO98ohP//gS D/is42CRiBelk8q9v9w7SDdvZ2ML+xbPlT/Fo= 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; bh=aZuHMnS8HoYQvymWT9toB6eMu7hXaR3HCblMyZn8Yd8=; b=gnDrxMMFAFSd5r6Y2X/L83+wLYcZ+7k5+u5cJbvJYijtQ1qegA7xd69SUPC62XtTdZ kLNQVJ1Vae1cJh3U//vBGkuOXrQ8DpdKpevcYXOR6093hEjZ8pIL/MHkEHch2ws4JSoc DRMU0DTJ1Ptvok3YjZ9vGcBhv8gXtajq2E4CrnIYD4mdP91CHL+HkvHBw3+TSmnB1sY5 Y2Ob6wms3ZP68oJNVf5Jr00Pu7NLXHti7zbzaxYrymqxuMjgZntzGahJrTTxtwcpKxtU 4MYm0zXWQH/pOfjEJzBvJ/Y/Hhi09mnJ7lRfzRFexFpuvjJ7GTflZ8CbgR3siWSZx5TH xA1Q== X-Gm-Message-State: ALQs6tD4Rd7vyOvIfbTTF+rfaGvz+i5hjmWjtEpqpMvHdkAo+Xa+W63J y0OEeqw4Hd2NCcjvg5yrPcACjfj/Dyg= X-Received: by 2002:a63:5ec5:: with SMTP id s188-v6mr20021730pgb.21.1525372742210; Thu, 03 May 2018 11:39:02 -0700 (PDT) Received: from localhost.localdomain ([106.51.17.226]) by smtp.gmail.com with ESMTPSA id o5-v6sm4130786pgv.47.2018.05.03.11.38.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 May 2018 11:39:01 -0700 (PDT) From: Amit Pundir To: lkml , linux-wireless@vger.kernel.org Cc: Suren Baghdasaryan , Samuel Ortiz , Christophe Ricard , Andy Shevchenko , Greg KH , John Stultz , Dmitry Shmidt , Todd Kjos , Android Kernel Team , Stable Subject: [PATCH v3 1/4] NFC: st21nfca: Fix out of bounds kernel access when handling ATR_REQ Date: Fri, 4 May 2018 00:08:53 +0530 Message-Id: <1525372736-25094-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suren Baghdasaryan Out of bounds kernel accesses in st21nfca's NFC HCI layer might happen when handling ATR_REQ events if user-specified atr_req->length is bigger than the buffer size. In that case memcpy() inside st21nfca_tm_send_atr_res() will read extra bytes resulting in OOB read from the kernel heap. cc: Stable Signed-off-by: Suren Baghdasaryan Signed-off-by: Amit Pundir Reviewed-by: Andy Shevchenko --- v3..v1: Resend. No changes. drivers/nfc/st21nfca/dep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c index fd08be2917e6..3420c5104c94 100644 --- a/drivers/nfc/st21nfca/dep.c +++ b/drivers/nfc/st21nfca/dep.c @@ -217,7 +217,8 @@ static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev, atr_req = (struct st21nfca_atr_req *)skb->data; - if (atr_req->length < sizeof(struct st21nfca_atr_req)) { + if (atr_req->length < sizeof(struct st21nfca_atr_req) || + atr_req->length > skb->len) { r = -EPROTO; goto exit; }