From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0A73C432BE for ; Thu, 26 Aug 2021 15:46:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2DB160F58 for ; Thu, 26 Aug 2021 15:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242992AbhHZPrU (ORCPT ); Thu, 26 Aug 2021 11:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231732AbhHZPrS (ORCPT ); Thu, 26 Aug 2021 11:47:18 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8304DC061757 for ; Thu, 26 Aug 2021 08:46:31 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id m17so2067150plc.6 for ; Thu, 26 Aug 2021 08:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=orYg9WhXU6LamUpPHbvyglJpY6TmtDwaRBuxFjtRHsQ=; b=SZieHhiquyxl/pFNCH15FSG/VpbZHUdbbIMOey3CtwaxnlpKgFILyoeR9Ja5mqDL10 iM/jmZ8KjaN+icB+kbAwcndKFVczbD1MmW/yoj3nLQZEzm5abYwdXF+69i/ETRT8MMbh WOSDC/t1QgRs37bFV7IQ16iZnE4GXI/+7yc1K5KHo4exQyyFQ7qsGTbHrU801QvKhGuk aRq3anck0JnfSLAl4T7FHg6tj4udF2BLX0Nvly/OsZUH8JIHBpSKkXeBd13LDJYRjFEm oHbcfpkGOjTh9oYaRckyH32IB/Eal6BgT41jn15xkGccwnLno0eVKGX3k2h01njSJ37g IGlQ== 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; bh=orYg9WhXU6LamUpPHbvyglJpY6TmtDwaRBuxFjtRHsQ=; b=X3ctliUYVOB1CbB574mKXRui4HYjP7/jHOo1Vv+9rwEkBtdLwZLmzCOknu834WZMyw CXjwCpQMmcquN4bZB/FhVkL83poOv6CKMKuWyjSqJeZo2wwGMmYUHTPYaxtVNxMeSmvt +YyoMB4Di75iJ6oVE84pATQ7XNWQm01/vSx4NMSUcjG/TNHYrGHqSsHkI2MfalatRIkg UbMmioKYZ7mpE322SK6sWe/ZSsqmP1RwvR2z3YSfsvqsa0PfYLP0U4D8Me3dHrCxHOSK k5k90M5pH40fRty2lYpdFg12LikWcIfSY8Z+ssK1HiK0z/ShTvjllZHOUfJiNWspLj1g 6VnA== X-Gm-Message-State: AOAM5321h5qRVWorUEYSkNM1qtsWyaWPhKkzid/cBjVJ1GfxheLXJG0Q 9wu7dcni1wmWItqE32dIQ7M= X-Google-Smtp-Source: ABdhPJzDTrhA65210RX8xMhY6wNPQQks306FL40SouNK1Inmobb7UuUqMoM/s9JdeGfNjgMCkx2Sdg== X-Received: by 2002:a17:902:edd7:b0:136:9429:d148 with SMTP id q23-20020a170902edd700b001369429d148mr4065836plk.33.1629992791064; Thu, 26 Aug 2021 08:46:31 -0700 (PDT) Received: from localhost.localdomain ([222.205.124.103]) by smtp.gmail.com with ESMTPSA id p10sm3593898pjv.39.2021.08.26.08.46.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 08:46:30 -0700 (PDT) From: Wenlong Zhang To: gregkh@linuxfoundation.org Cc: fabioaiuto83@gmail.com, ross.schm.dev@gmail.com, marcocesati@gmail.com, insafonov@gmail.com, cyruscyliu@gmail.com, yajin@vm-kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Wenlong Zhang Subject: [PATCH] staging: rtl8723bs: prevent ->ssid overflow in rtw_wx_set_scan() Date: Thu, 26 Aug 2021 23:46:22 +0800 Message-Id: <20210826154622.55361-1-yixiaonn@gmail.com> X-Mailer: git-send-email 2.15.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 74b6b20df8cf ("staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()") fixed up the staging driver rtl8188eu by adding another check to prevent writing beyond the end of the ->ssid[] array. Resolve this by properly fixing up the rtl8723bs driver's version of rtw_wx_set_scan() Reported-by: Wenlong Zhang(iLifetruth) Fixes: 74b6b20df8cf ("staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()") Signed-off-by: Wenlong Zhang --- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index 902ac8169948..6fc1020cea11 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -1351,9 +1351,9 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, sec_len = *(pos++); len -= 1; - if (sec_len > 0 && sec_len <= len) { + if (sec_len > 0 && sec_len <= len && sec_len <= 32) { ssid[ssid_index].SsidLength = sec_len; - memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); + memcpy(ssid[ssid_index].Ssid, pos, sec_len); /* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */ /* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */ ssid_index++; -- 2.15.0