Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp144371rwd; Sat, 13 May 2023 15:05:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6uzITcS09orU2TQLS6AhMiVa42D2NFIibYPAActbuN07/iLzu4uMaWU4pw319zIkvz4d+t X-Received: by 2002:a17:903:1209:b0:1a9:7912:850e with SMTP id l9-20020a170903120900b001a97912850emr35794486plh.10.1684015509133; Sat, 13 May 2023 15:05:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684015509; cv=none; d=google.com; s=arc-20160816; b=lnzEnSDKDVFkBlU9Vj4k6VL1G1Mnv0evb55jAmCyfMp+je/yPV2fw/eG+9KXJDvnuw nezgZXybsvxG0jJLDGytXD6odSlc8sFn7I+3xhjdrN9t1NL3St8FQXgK4Rw/myMcdX+D BqtKc/lui8MHTir37GJCp9UOJqCRPTT27LAeQA4ft27ssg9d8g4Vqre42jNLwFcgyVKZ W9JaGSwu1VjuNvVa2mM6Ld6+WL1LhnVP4M3EJsSsllO35Sz+jcAiMQHDqQtkYyVvz3Ji uN8ySklpwJzZ4kWGRNgTTyutFS0A8GiO6wlyUXkNcxJUjJF2PCby4um46H+hzbHFDLw3 h97w== 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:dkim-filter; bh=6rJLFQzTqQuln9eGYgx3BvQDSlEIAh0h1G71nSAdqhM=; b=T9+OC7GmlY3HJvvyDlYc5GXXvQdJyNkYGQcvHR4o9+7AuCuaKniYoxxTDBquiMOEbG 5xvqIo3N0cefMEEPSS9oa0nj9N4rCh8meaHiEcacYqbDn7g1zIyPRpaEGeOVwJWlohLG UVXiMrpszn5PkqcW+6VWFNcm2tfEJiY/6FncPJb5IR0mrNcLBXd3yO0U3OYFyThTvTod RQWmoAcFXXksgVF0zfej81oxhwA+9LbkUWuPDgHtjkm0AmOK+kZwmn628R4nlBGn0HCc ZfQhHLHJdgN969tmK+69c+GpHZYvGMQMw20j1Y6Wx3zBKA6ekz9LcsiEwrXs9604LXCs Y+eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=k9KSWGlI; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q6-20020a170902dac600b001ac75cbde64si13515059plx.622.2023.05.13.15.04.58; Sat, 13 May 2023 15:05:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=k9KSWGlI; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229688AbjEMVmH (ORCPT + 63 others); Sat, 13 May 2023 17:42:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjEMVmG (ORCPT ); Sat, 13 May 2023 17:42:06 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 807482720; Sat, 13 May 2023 14:42:05 -0700 (PDT) Received: from fpc.intra.ispras.ru (unknown [10.10.165.8]) by mail.ispras.ru (Postfix) with ESMTPSA id 9E12E44C1012; Sat, 13 May 2023 21:42:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 9E12E44C1012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1684014123; bh=6rJLFQzTqQuln9eGYgx3BvQDSlEIAh0h1G71nSAdqhM=; h=From:To:Cc:Subject:Date:From; b=k9KSWGlIEpOYLlMwhxUF82/VVZlhZ+BvdDYsi8ZAyB9O8IUdFKawCuVsHX/evAMBT shuB4nuBRMXGU4o11FN4sppoCgMcDfm7mt553lgz2Ep0Ek6rmJnVczZtPAvQw4WcSl 2xp01YsVkoD7ZL6Fb+bkxHewqHBpoNKoPW9Mg9c4= From: Fedor Pchelkin To: Kalle Valo Cc: Fedor Pchelkin , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Takeshi Misawa , Alexey Khoroshilov , lvc-project@linuxtesting.org, syzbot+b68fbebe56d8362907e8@syzkaller.appspotmail.com Subject: [PATCH] wifi: ath9k: don't allow to overwrite ENDPOINT0 attributes Date: Sun, 14 May 2023 00:41:46 +0300 Message-Id: <20230513214146.120963-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org A bad USB device is able to construct a service connection response message with target endpoint being ENDPOINT0 which is reserved for HTC_CTRL_RSVD_SVC and should not be modified to be used for any other services. Reject such service connection responses. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: fb9987d0f748 ("ath9k_htc: Support for AR9271 chipset.") Reported-by: syzbot+b68fbebe56d8362907e8@syzkaller.appspotmail.com Signed-off-by: Fedor Pchelkin --- drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c index fe62ff668f75..a15d8d80df87 100644 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c @@ -114,7 +114,7 @@ static void htc_process_conn_rsp(struct htc_target *target, if (svc_rspmsg->status == HTC_SERVICE_SUCCESS) { epid = svc_rspmsg->endpoint_id; - if (epid < 0 || epid >= ENDPOINT_MAX) + if (epid <= 0 || epid >= ENDPOINT_MAX) return; service_id = be16_to_cpu(svc_rspmsg->service_id); -- 2.34.1