From patchwork Thu Sep 16 16:33:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Shadura X-Patchwork-Id: 513051 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1482809jao; Thu, 16 Sep 2021 11:32:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRaKYCeE8U5pN40FJ8E65109ULJBdI1SFPrZcN4mFErCps4Ahp/af8FaPihNkih3sSHGKj X-Received: by 2002:a05:6402:13d0:: with SMTP id a16mr7926028edx.155.1631817145781; Thu, 16 Sep 2021 11:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631817145; cv=none; d=google.com; s=arc-20160816; b=oZS69vTsUoXJIhWepHudwA6eyQFkiRgxWiBCePsEFxv0DnAXtthwfROX4FQunUm+aE juealSCaRzIjt/+tLDGO1WcjZhUJjHlIJAt8sk6ksonNyNtx0bprj6rlpdBSAIHCAmGE 64Ks4FFh4YpJY6+u3rwpvvyZkdIqshI+jykUPkz4bpOiKLDZGRX6gc69sp3CbeeBPUV5 4JiaQaKBjFlhodH3yr858vbxc445jJteRPLoTYSGnkfMc62oor7G/leA9cfWOVLfqCyU K0sNSiAhdVvARqugbaIimtcOUDZUv/JL9o8VqlGjcSxpdLpQTPgMd/97XVcNOlmhu8mp dnyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LUgAXnOs3wg6YYGfup/G6E2ZLznwcFknP60Ddf9yAUY=; b=TsYmpJh/1f+8kLvT5vT3brfk3NV3SVZ9M/45kE1KBBLVWUeZWqdpo5YvV3TraC1fJg wnLajPYIiwWHO/U42OzGzR5QcSfMzRT1tb1sGa87cv4o/S8Y9DN3rFiluyZVsBt1dfqO HebQZ75oWrbf5FP6u4ndka/6JEGM2TDfW4rw57gCaeSVsTVWP6cYS/T/ZKol7ynnEpMu mKa/8gPro/zIXYuJrTbc/X8fy0C8+UJdFOK8XIAReIJI4SlPmjzfqwUUyf+h2H0/P8pK pr0FQ4tbGyo+2LknQZE84Z6z1OPFivu1hB5rPU/HZAx5YPUHBv53Rp4zhfeDgtYEa5xN bdpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@shadura.me header.s=a header.b=ihI0XvmX; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.co.uk Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p14si4201646ejn.419.2021.09.16.11.32.25; Thu, 16 Sep 2021 11:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@shadura.me header.s=a header.b=ihI0XvmX; spf=pass (google.com: domain of linux-input-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.co.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344320AbhIPSdo (ORCPT + 1 other); Thu, 16 Sep 2021 14:33:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243747AbhIPSdR (ORCPT ); Thu, 16 Sep 2021 14:33:17 -0400 X-Greylist: delayed 1032 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 16 Sep 2021 09:50:44 PDT Received: from cambridge.shadura.me (cambridge.shadura.me [IPv6:2a00:1098:0:86:1000:13:0:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38984C0ABB59; Thu, 16 Sep 2021 09:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=shadura.me; s=a; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To: From:Content-Type:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References; bh=LUgAXnOs3wg6YYGfup/G6E2ZLznwcFknP60Ddf9yAUY=; b=ihI0XvmXcPXM3S rsVZQP/tZsLpjhJn62SbKgPcD1ynN3mMTnS8BGyz7QBfKtcG9QSyRmbCPyd6wnYnuiPvoj/rjYfFO e5MGGqEhPMaAXiArMuzpwIAKpu0NzlpSoj9OzlcxSW36z2yxPVGikUQ4ZLpOOhFK/VepRf1I2N+kF EwM=; Received: from 85-237-234-36.dynamic.orange.sk ([85.237.234.36] helo=localhost) by cambridge.shadura.me with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mQuKG-0002qR-B5; Thu, 16 Sep 2021 18:33:28 +0200 From: Andrej Shadura To: =?utf-8?b?SmnFmcOtIEtvc2luYQ==?= Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, kernel@collabora.com, Benjamin Tissoires Subject: [PATCH] HID: u2fzero: ignore incomplete packets without data Date: Thu, 16 Sep 2021 17:33:11 +0100 Message-Id: <20210916163311.11968-1-andrew.shadura@collabora.co.uk> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Since the actual_length calculation is performed unsigned, packets shorter than 7 bytes (e.g. packets without data or otherwise truncated) or non-received packets ("zero" bytes) can cause buffer overflow. Link: https://bugzilla.kernel.org/show_bug.cgi?id=214437 Fixes: 42337b9d4d958("HID: add driver for U2F Zero built-in LED and RNG") Signed-off-by: Andrej Shadura --- drivers/hid/hid-u2fzero.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.31.1 diff --git a/drivers/hid/hid-u2fzero.c b/drivers/hid/hid-u2fzero.c index 95e0807878c7..d70cd3d7f583 100644 --- a/drivers/hid/hid-u2fzero.c +++ b/drivers/hid/hid-u2fzero.c @@ -198,7 +198,9 @@ static int u2fzero_rng_read(struct hwrng *rng, void *data, } ret = u2fzero_recv(dev, &req, &resp); - if (ret < 0) + + /* ignore errors or packets without data */ + if (ret < offsetof(struct u2f_hid_msg, init.data)) return 0; /* only take the minimum amount of data it is safe to take */