From patchwork Tue Mar 2 17:43:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1446150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dqkxz1PrPz9sRR; Wed, 3 Mar 2021 04:43:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lH93R-0000NQ-72; Tue, 02 Mar 2021 17:43:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH93O-0000N7-3q for kernel-team@lists.ubuntu.com; Tue, 02 Mar 2021 17:43:26 +0000 Received: from mail-pf1-f200.google.com ([209.85.210.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH93N-0005v3-OU for kernel-team@lists.ubuntu.com; Tue, 02 Mar 2021 17:43:25 +0000 Received: by mail-pf1-f200.google.com with SMTP id t69so13803274pfc.0 for ; Tue, 02 Mar 2021 09:43:25 -0800 (PST) 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:in-reply-to :references; bh=BiEwZIdw/WqC2/OImhQ/LwIouTo06Po2/PpPk52Dcds=; b=MzQB5vEytIGhzKqFsmGrkJ6DYsDVQ+Watty1/6lL48b8vo2A6hZbCwirowci9RgTql 9fGQMejlNRyNiyqTPENkWpfgVEdJ3z19bTxvH2Jdos2ovaMMdzI3+IUBSzPcvCO3mq3s GWaYD3gBCU1RZ1nTwv6nRKmnskZUQPHVQq+7Xvct62EJZHzqsCn+bUuEl2E6PvQZ/JNE Ut2naeWK1aTyovhSbpxHezqk5+FNVmnP0heEI74tOpUsDcLIpnEyA6JfuiVMyCyGAsA3 KllNrcInofTAVCVO6rN9zSwtVrwxUYjajGfnwtL5ZUUS7nlZpk1PKXkbfGde2B+Wrc8V 6cKw== X-Gm-Message-State: AOAM531jtRxrhc3oyV8rV+Ja45GQFj9aVZ+Ure8UU1tlMVMs5/z0EVDI EZEjPKxWtLVFXfZyPW3hQX5DqhRz49vHd1lmT4uRFdFtLeNH59JsmU3ye0Z05WwpsRq60dpW3Q3 0UJkqP1ePyfedCGKBnzX2Cn5zv3HkgAVsFF+ZOk7NYA== X-Received: by 2002:aa7:9707:0:b029:1ee:8ad4:7840 with SMTP id a7-20020aa797070000b02901ee8ad47840mr4312355pfg.32.1614707004119; Tue, 02 Mar 2021 09:43:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3Rf3XQGAjn3bwYWVVYhx6SsgIhnz9fnAx4C4bdNIlMEoT70tK7AGQ5B7QbZ6HkL28oVRtfQ== X-Received: by 2002:aa7:9707:0:b029:1ee:8ad4:7840 with SMTP id a7-20020aa797070000b02901ee8ad47840mr4312332pfg.32.1614707003818; Tue, 02 Mar 2021 09:43:23 -0800 (PST) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id u4sm21019853pgj.29.2021.03.02.09.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 09:43:23 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] mwifiex: Fix possible buffer overflows in mwifiex_cmd_802_11_ad_hoc_start Date: Tue, 2 Mar 2021 10:43:11 -0700 Message-Id: <20210302174311.4726-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210302174311.4726-1-tim.gardner@canonical.com> References: <20210302174311.4726-1-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Zhang Xiaohui CVE-CVE-2020-36158 mwifiex_cmd_802_11_ad_hoc_start() calls memcpy() without checking the destination size may trigger a buffer overflower, which a local user could use to cause denial of service or the execution of arbitrary code. Fix it by putting the length check before calling memcpy(). Signed-off-by: Zhang Xiaohui Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20201206084801.26479-1-ruc_zhangxiaohui@163.com (cherry picked from commit 5c455c5ab332773464d02ba17015acdca198f03d) Signed-off-by: Tim Gardner --- drivers/net/wireless/marvell/mwifiex/join.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c index d87aeff70cef..c2cb1e711c06 100644 --- a/drivers/net/wireless/marvell/mwifiex/join.c +++ b/drivers/net/wireless/marvell/mwifiex/join.c @@ -877,6 +877,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, memset(adhoc_start->ssid, 0, IEEE80211_MAX_SSID_LEN); + if (req_ssid->ssid_len > IEEE80211_MAX_SSID_LEN) + req_ssid->ssid_len = IEEE80211_MAX_SSID_LEN; memcpy(adhoc_start->ssid, req_ssid->ssid, req_ssid->ssid_len); mwifiex_dbg(adapter, INFO, "info: ADHOC_S_CMD: SSID = %s\n",