From patchwork Wed Mar 15 20:21:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 70438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp119015wrt; Wed, 15 Mar 2023 13:58:16 -0700 (PDT) X-Google-Smtp-Source: AK7set8rBe7G0MGOCXOtvOlmxNqVYc87W6ZikPS/KYp+QkZTi5ECRmqwstv3tj+OUwVfgfF4TEOm X-Received: by 2002:a17:902:ea0c:b0:19a:a0d0:10f0 with SMTP id s12-20020a170902ea0c00b0019aa0d010f0mr1031239plg.23.1678913896355; Wed, 15 Mar 2023 13:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678913896; cv=none; d=google.com; s=arc-20160816; b=k8UMx09TtCyJmYvp8Ghavt+sE+xyMl5A/zsOKjDTL1CrREVgoveqjQct3OazZVxrI2 dKQ1byC7uKs2Uv4bGbpjzX6zotBk1QQsGPc2PBz+nT1gXYjJjX0WEfcG1McoJmpX2L69 F6M6mfzQwG2/dM3dh4cHEZJMJ8ihk4uou35D42yGy1kTcsVZc8xucHBU8ALR74TsIjsD ywLA4I2qeD4ZyQEIJSxfX/St6vFf55ZT/RT+a58lJ3oLLgO1Ahu5dTLUZVO6j1sGnie/ L+JTUUFFKEjAk6C4dW+MJZT+H6Bx+d21MmhvhnCyiuJAHAYHBktVDTK9NUeAA5WsikvZ VpNQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=KHlEKAhpUGzm2mZCMucQ8WbZWdQoP58ONPTTGbeX3MM=; b=GFEMcgCPvGTboxJaZ8I/SNJyMuoa96EJBZs3+9y0UcdhTP30BNGBfx9rGx0YpOrExv fYLuUMjRyemf9qglZw6kJlFgOapOzuWh+gvk6m+YjsBa9aWY4w+Tpn9WCIWBZfkgI6Ye uzEkufAcW3fj9gX6uqJKAMsLVFkTlSigLfctk6Vyy7L7jPuLkV65KwvPbpM1xzbXvpud 4sj0fKGjL6SBMlv/MtDDYgQRHpkQQd3H8c6NFcVJWUWu/6xQOnNtoEiHJ5eEmocuxkBv HwqupmChm5h4Yb24koNOHgAxeusf5o40KXfADvSC7xqPmjSg0r51prh/rYzd6qVWyu+L 19+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=pF8+mLdy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q5-20020a17090311c500b001a0aecb8b3dsi3275050plh.588.2023.03.15.13.57.59; Wed, 15 Mar 2023 13:58:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=pF8+mLdy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232745AbjCOUWo (ORCPT + 99 others); Wed, 15 Mar 2023 16:22:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232877AbjCOUWe (ORCPT ); Wed, 15 Mar 2023 16:22:34 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A0B9A21AE; Wed, 15 Mar 2023 13:22:24 -0700 (PDT) Received: from fpc.intra.ispras.ru (unknown [10.10.165.16]) by mail.ispras.ru (Postfix) with ESMTPSA id 000B144C101F; Wed, 15 Mar 2023 20:22:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 000B144C101F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1678911743; bh=KHlEKAhpUGzm2mZCMucQ8WbZWdQoP58ONPTTGbeX3MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pF8+mLdy40gtvvg8OB9D1OQDILvPJaHvvHMnT7RNekOc6QhJSM3bhgNu+no7WBUPh iEbbhudO8Dzq8G8WsxsNaChuyN0EA2dyfCCBcJVUnq7sj5jBuHY/bny1AQS0INSVZj 5t3iTEBkUd36YwJFAhhKN1TBuroFwJAK3VXphddo= From: Fedor Pchelkin To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Cc: Fedor Pchelkin , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Senthil Balasubramanian , "John W. Linville" , Vasanthakumar Thiagarajan , Sujith , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org Subject: [PATCH 3/3] wifi: ath9k: fix ath9k_wmi_cmd return value when device is unplugged Date: Wed, 15 Mar 2023 23:21:12 +0300 Message-Id: <20230315202112.163012-4-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315202112.163012-1-pchelkin@ispras.ru> References: <20230315202112.163012-1-pchelkin@ispras.ru> MIME-Version: 1.0 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, 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760468817482705477?= X-GMAIL-MSGID: =?utf-8?q?1760468817482705477?= Return with an error code in case the USB device has been already unplugged. Otherwise the callers of ath9k_wmi_cmd() are unaware of the fact that cmd_buf and rsp_buf are not initialized or handled properly inside this function. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: a3be14b76da1 ("ath9k_htc: Handle device unplug properly") Signed-off-by: Fedor Pchelkin --- drivers/net/wireless/ath/ath9k/wmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c index 99a91bbaace9..3e0ad4f8f0a0 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.c +++ b/drivers/net/wireless/ath/ath9k/wmi.c @@ -320,8 +320,11 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, unsigned long time_left; int ret = 0; - if (ah->ah_flags & AH_UNPLUGGED) - return 0; + if (ah->ah_flags & AH_UNPLUGGED) { + ath_dbg(common, WMI, "Device unplugged for WMI command: %s\n", + wmi_cmd_to_name(cmd_id)); + return -ENODEV; + } skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC); if (!skb)