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=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 E8DD5CA9EAC for ; Sat, 19 Oct 2019 19:02:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9DC021D7C for ; Sat, 19 Oct 2019 19:02:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H8YAslEd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726164AbfJSTCz (ORCPT ); Sat, 19 Oct 2019 15:02:55 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:43334 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726078AbfJSTCy (ORCPT ); Sat, 19 Oct 2019 15:02:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571511773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dn11RnQbQQOG+Q/OgBP8XLWxJZK3dTGJ/aBY7/8g9lQ=; b=H8YAslEdpQ8aE9kaiZmyiDG9H8LIMGw5mhT4EH3xBAwmJBKBWX3kJxih9ZvIBnWwNW5Kpx UYTm8UKHHYExsN+3+9plVvCVjo6QJTH8vQOQK2zU7m1WTZUcDpsMFjZLx84cSxVjGGKKw/ wFWU+FNz6b2Ilwo5FPx4cpDeyDPZoOI= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-329-jcuSNeKANL2oiA3I-ybMXQ-1; Sat, 19 Oct 2019 15:02:50 -0400 Received: by mail-qk1-f200.google.com with SMTP id g62so9190205qkb.20 for ; Sat, 19 Oct 2019 12:02:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kxEwZLybIpNz0Vb4W9kORWNZfwwCGa9psMh9sXu2bjE=; b=hCfKRrPvAbD2pHJJhsTi9sWFj7jOzrzUdqXFMJ/jOI0bwKZ2ARBNoEE11li5PV4jbY bm2CWj0caolrp6wkcjTPUC1sdukIOc2Jnrl05TuAJ1KHMeQz9CYW0cvE4wKEyeWYnVZI 0hUDxMWDP1CAwo7Yb+A8CEB7a/6nIxPT6llDTJvnkuE3FIQNshpq43yEM7aZBKk7BK8p pJY/PAmYM5yjijwN0caWlbov6ZnclxaQzYIx92Vb1eGDQmATInNZKIfuxhQssGuxwZvx 9bHtnBcnuwmH3USpsaXRhlppx5FAyjUo/6Grk/h93RwbtKCxuLZ0Yc/6uKWP//nUarIc dJug== X-Gm-Message-State: APjAAAX0P4hMuLcFQEAL1+FAyXKOWTjynzAcWN8PCt86xcLpCZ4/hOpV qXF3Dcov7/iEH8ANW6kYu04vpYNCDWukcv5jMG2TiR3agADTPV8Uvi9h2Y5w6Hi7hJ6Nxn4KxLr SV4WodpB3ooNoDKYf X-Received: by 2002:ac8:22b6:: with SMTP id f51mr16039310qta.210.1571511770032; Sat, 19 Oct 2019 12:02:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYeNR+SNTgFKYHZhJnIjW6j5UdIhrEsDzzcdKF07tcQ0YU0KGfmxdpwyCWtBWskmN+vHkcag== X-Received: by 2002:ac8:22b6:: with SMTP id f51mr16039286qta.210.1571511769597; Sat, 19 Oct 2019 12:02:49 -0700 (PDT) Received: from [192.168.1.157] (pool-96-235-39-235.pitbpa.fios.verizon.net. [96.235.39.235]) by smtp.gmail.com with ESMTPSA id t32sm6867826qtb.64.2019.10.19.12.02.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 19 Oct 2019 12:02:48 -0700 (PDT) Subject: Re: [PATCH v2] rtlwifi: Fix potential overflow on P2P code To: Kalle Valo Cc: Ping-Ke Shih , "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Waisman References: <20191018114321.13131-1-labbott@redhat.com> <871rv9xb2l.fsf@kamboji.qca.qualcomm.com> From: Laura Abbott Message-ID: <51b732bf-4575-d7d1-daff-ec1c2171a303@redhat.com> Date: Sat, 19 Oct 2019 15:02:47 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <871rv9xb2l.fsf@kamboji.qca.qualcomm.com> Content-Language: en-US X-MC-Unique: jcuSNeKANL2oiA3I-ybMXQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 10/19/19 6:51 AM, Kalle Valo wrote: > Laura Abbott writes: >=20 >> Nicolas Waisman noticed that even though noa_len is checked for >> a compatible length it's still possible to overrun the buffers >> of p2pinfo since there's no check on the upper bound of noa_num. >> Bound noa_num against P2P_MAX_NOA_NUM. >> >> Reported-by: Nicolas Waisman >> Signed-off-by: Laura Abbott >> --- >> v2: Use P2P_MAX_NOA_NUM instead of erroring out. >> --- >> drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wir= eless/realtek/rtlwifi/ps.c >> index 70f04c2f5b17..fff8dda14023 100644 >> --- a/drivers/net/wireless/realtek/rtlwifi/ps.c >> +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c >> @@ -754,6 +754,9 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, = void *data, >> =09=09=09=09return; >> =09=09=09} else { >> =09=09=09=09noa_num =3D (noa_len - 2) / 13; >> +=09=09=09=09if (noa_num > P2P_MAX_NOA_NUM) >> +=09=09=09=09=09noa_num =3D P2P_MAX_NOA_NUM; >> + >> =09=09=09} >> =09=09=09noa_index =3D ie[3]; >> =09=09=09if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode =3D=3D >> @@ -848,6 +851,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *h= w, void *data, >> =09=09=09=09return; >> =09=09=09} else { >> =09=09=09=09noa_num =3D (noa_len - 2) / 13; >> +=09=09=09=09if (noa_num > P2P_MAX_NOA_NUM) >> +=09=09=09=09=09noa_num =3D P2P_MAX_NOA_NUM; >=20 > IMHO using min() would be cleaner, but I'm fine with this as well. Up to > you. >=20 I believe the intention is to re-write this anyway so I'd prefer to just get this in given the uptick this issue seems to have gotten. Thanks, Laura