From patchwork Tue Jul 31 22:02:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 951837 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=android.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=android.com header.i=@android.com header.b="vHRbNxB+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41g9RN1ZCkz9s0R for ; Wed, 1 Aug 2018 08:02:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732556AbeGaXpQ (ORCPT ); Tue, 31 Jul 2018 19:45:16 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42466 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732189AbeGaXpP (ORCPT ); Tue, 31 Jul 2018 19:45:15 -0400 Received: by mail-ed1-f68.google.com with SMTP id r4-v6so5900325edp.9 for ; Tue, 31 Jul 2018 15:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pj6b7/RsWBT0aQ+jchdnzHqrIb6BogBIBVUR0Iia8aQ=; b=vHRbNxB+AHgPplyqCsX5N0xKuzE471+lKPaF8UZP2JsNDifjbUSZr+tjjk0tHR13JI XG9qfYdLZQ0AzsUEfO4goxJf7bg+EMq1v4TUYnEtzd5s75iD8qVeKaviN7Nuh2PE/rlI Hpb0vzXnNds6BgZ8qKQPcAUVkJgKtGXKA48aspktdTtILlW4LYilI6LE7whj8AukB7Cq 4mwaI77nAYcNzV7MfE3YJQRCKuN2UCO1ZhH1y6VKxS6CHmB+qzrxVAZQLYGPLMbuz307 Gq2Es34Xi1GiBTzswrchDz5KyXI1FiHaY2UG95bC+BW0W1lmfT+oR/0JON2QnCwmmhmq l5Ww== 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:mime-version :content-transfer-encoding; bh=pj6b7/RsWBT0aQ+jchdnzHqrIb6BogBIBVUR0Iia8aQ=; b=LdBoLEUi0a2wxqcJx76cIR1smYQC3TZs6ipOprX2wXgCy14AXwHsG4WG7iBc22Jfry T4/lF3s20cYFJi39kPB1tMAbzZxCp3XOZyQH10YEhj/FHRkOFtC+lri25AkrNaQj0twP Rc7M8xbkiu66DTdKjtL6yiKEpINtHBrXojnmil1Lhw77kBQLpChTmsaOIR8oO9ND/ew2 3BWtXgAHqqXWhUS3VJyPpLkwhOkNOCEVMREe8ny5rkQr0afiZiY3c6EYmCXELx1QlrQE YbNbU7zTZLT/+Uf0j2iitVcc0rvNrQQuMVOuYA3b9fkewyu7o+7tuGVPXdQOzq0ThCcr 9Iyg== X-Gm-Message-State: AOUpUlHo2JSZtmdkeDxz3MHS8HfpwtJfuBNvs2tW99SkyzgLW1cajOSb bqiqojqk0SfFhr4VcQOag74CVw== X-Google-Smtp-Source: AAOMgpfsqxAZSc5IoNRaWxAIqgct13uu6DStZ2qsJv6VOC63RAaGlyKifwoHQH7/qQt0HrjwmjCVjg== X-Received: by 2002:aa7:d588:: with SMTP id r8-v6mr1301761edq.130.1533074570438; Tue, 31 Jul 2018 15:02:50 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1611:8fc3:703d:7635:5997]) by smtp.gmail.com with ESMTPSA id g14-v6sm3431132edm.25.2018.07.31.15.02.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 15:02:49 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Cc: Mark Salyzyn , Marcel Holtmann , Johan Hedberg , "David S. Miller" , Kees Cook , Benjamin Tissoires , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, security@kernel.org, kernel-team@android.com, Jiri Kosina Subject: [PATCH] HID: Bluetooth: hidp: buffer overflow in hidp_process_report Date: Tue, 31 Jul 2018 15:02:13 -0700 Message-Id: <20180731220225.159741-1-salyzyn@android.com> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org CVE-2018-9363 The buffer length is unsigned at all layers, but gets cast to int and checked in hidp_process_report and can lead to a buffer overflow. Switch len parameter to unsigned int to resolve issue. This affects 3.18 and newer kernels. Signed-off-by: Mark Salyzyn Fixes: a4b1b5877b514b276f0f31efe02388a9c2836728 ("HID: Bluetooth: hidp: make sure input buffers are big enough") Cc: Marcel Holtmann Cc: Johan Hedberg Cc: "David S. Miller" Cc: Kees Cook Cc: Benjamin Tissoires Cc: linux-bluetooth@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: security@kernel.org Cc: kernel-team@android.com Acked-by: Kees Cook --- net/bluetooth/hidp/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 1036e4fa1ea2..3bba8f4b08a9 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -431,8 +431,8 @@ static void hidp_del_timer(struct hidp_session *session) del_timer(&session->timer); } -static void hidp_process_report(struct hidp_session *session, - int type, const u8 *data, int len, int intr) +static void hidp_process_report(struct hidp_session *session, int type, + const u8 *data, unsigned int len, int intr) { if (len > HID_MAX_BUFFER_SIZE) len = HID_MAX_BUFFER_SIZE;