From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E27D03375DD for ; Fri, 16 Jan 2026 16:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768579789; cv=none; b=bELI0H2/p0+irBzXrSn4RynYh1CH37XUxr1eWjNxYR0+cNW7zT9IqZ1IFYwcedvwhcr44QXSzwr6bV0qUNYfW6pR2RN2k1qI4mUbnt2DdjaG8eHSJPEbBFBw+q1was5rZNVOhUomNvjE+BrvkJg3l08FA7nhJTwzU1bQReGM5/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768579789; c=relaxed/simple; bh=hD0ctyk3z1lwsqNqBS9z+YXKuHl6FbWbC+3sUQQrANs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MmpHpY7JWNKDBVojhgBMPNOT96ePdhKmY91gdORYrPOusCd4mT1eVv8vaLq3w9vJSafRmdKBvhxK2FeZW+u04VARX490+i3TPXPxcujCYql+bdWYhOEYAFUQTQwqlgfwLkgQh4lg2g+yhlWDOCTDxFJhJfiO7GNF7FrKq7Ym2VY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=T1Dm68Gn; arc=none smtp.client-ip=209.85.222.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T1Dm68Gn" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-8b2f0f9e4cbso191254585a.0 for ; Fri, 16 Jan 2026 08:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768579781; x=1769184581; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Rz3BzbAePDh/GESGmxqoJgS1/apuaB7bGaio8ArDl4=; b=T1Dm68GnnnYdz2d2yjj/NZ9CqWLFanx4+wjtEjlntfYwr9uT4nvJ3T85bd9C296G7D 4mncW7sjHY3ppd7tlqpxXOaze526jUY49A3kp56aGwaVkvmqokUHbIvOX+TvCI8IRYPj vIhoCa2znykZ6brDq6KJ/X67O4l2MamdqSCa2z00veTLnoxo+TuJ7eZxItFMS6Blo315 ChTNJM6Q5xVEye3fk+O0Qb5c5nX/9JQ22XL3w6w0VKzA2e5yaJt9qFPA3jvkw/wKeR+N dV4HUZEPqNy+WSdie8ltKbq4Y1GCvgvLYPQCRvFeDIlHJBmrqvzdPD1Bfs8INPAN73gv zWSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768579781; x=1769184581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0Rz3BzbAePDh/GESGmxqoJgS1/apuaB7bGaio8ArDl4=; b=hWkschGIF2MqQcoQy2njIDE6twMOKqMIyETYmQeG2b/CwUtEspSxjAct0KoMuLgDgv UBmNgaXhrlT6mrOD+RdgK1Q89/MW99Z13v5C9a2DNDtb6KSLoOmNNiXUKQMZFp7zvk3A DdeqtIEtYpHsVRwCqGp0BhjKCL4852gUCenTgK2D6I617HCE4PTGzt7ZYet/funC6OCL p2YPEgWVPcYmzZJkqIn2NuLnqxL4TZrEclYdVn2L41HhCweFzbVLX3Waf09KBG5Xs5bG PMEVJa7PW2qTTiL7FoF3W/6X+X8+UZVdsXGJA8LUFWxbhMuIAO2HesUPiY9vWNCbA2b8 Ku9w== X-Forwarded-Encrypted: i=1; AJvYcCXYxm9AffYkakYBbF10v7TYUorQuLMYZPzchYSYgdhJEkMt3C0tydoUVrr0BirnJtxEgPTpY5PMrs9gvms=@vger.kernel.org X-Gm-Message-State: AOJu0YwkCcp2QFS83Me+MpqwcKuCeQIDePx6EhtTrMaifGuylvX/HHMr 5KD+EEIHN/UQ13lNZdXLazQ3MvP7kiiD6NrK56m/jgQkajrTSv6tAtVd4M66dbCi X-Gm-Gg: AY/fxX6a8fWQhIw1NYgJ7HtAQqzTsRKOX7Nj9c0/NbYGWVdU8s+HlXqBL8pH82oV8BC IY/f8LSF/9RpjiDc/GS+Xpxgep4HoOZvFp5LzgdQErg5dzXZGZaEkfiTfr8433bmGZPWVS/bwBD pM9UjHGphGDOr26nfsC72S3vGoQLT19HaziiZ1pzW6qSJzsek1mLonTX56/uV7gdfoQWwtaNOpO XPvFt9GzCz3T+8tN1zgrIpepxG25Bv9jpjNQxTEbMvSZ6egqMAOsL6svjwnzLzfo82pG5uosQGp nCSgyqb/lbL/xJj6aHBNAm6zAZ/You06/pvryq8zF6TGD5/L0upxyjBaBdzfSXZh07lCN5AOxUW cZ7Vdzwcc7OdtqmTYlLwemCUgx9nNlsjc2rBnU/JpZta48btQ3P/oroAQnRARWtjsYJ/kOCmtkn FoknAUdc0dQZ8jJKB8bcu5e88E X-Received: by 2002:a05:620a:4588:b0:8b8:7f8d:a8b2 with SMTP id af79cd13be357-8c6a6524b29mr447591985a.44.1768579780567; Fri, 16 Jan 2026 08:09:40 -0800 (PST) Received: from localhost ([132.216.195.103]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c6a728f2f2sm250248885a.47.2026.01.16.08.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 08:09:40 -0800 (PST) From: William Hansen-Baird To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, William Hansen-Baird Subject: [PATCH 5/5] staging: rtl8723bs: core/rtw_mlme_ext.c: initialize copy_len, clearing later control-flow. Date: Fri, 16 Jan 2026 11:08:51 -0500 Message-ID: <20260116160914.88069-5-william.hansen.baird@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116160914.88069-1-william.hansen.baird@gmail.com> References: <20260116160914.88069-1-william.hansen.baird@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Initialize copy_len to 0 in rtw_parse_assoc_security_ies function. This allows later if-statement to not have to explicitly set copy_len to 0. Thus we can make the if statement single-lined, and remove the braces from the if-else branch. The change is purely cosmetic and changes no logic. Signed-off-by: William Hansen-Baird --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 842e95e1eaec..d470725a033f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -946,6 +946,7 @@ static unsigned short rtw_parse_assoc_security_ies(struct adapter *padapter, pstat->wpa_pairwise_cipher = 0; pstat->wpa2_pairwise_cipher = 0; memset(pstat->wpa_ie, 0, sizeof(pstat->wpa_ie)); + if ((psecuritypriv->wpa_psk & BIT(1)) && elems->rsn_ie) { int group_cipher = 0, pairwise_cipher = 0; @@ -1016,17 +1017,15 @@ static unsigned short rtw_parse_assoc_security_ies(struct adapter *padapter, } } else { - int copy_len; + int copy_len = 0; if (psecuritypriv->wpa_psk == 0) return WLAN_STATUS_INVALID_IE; - if (elems->wps_ie) { + if (elems->wps_ie) pstat->flags |= WLAN_STA_WPS; - copy_len = 0; - } else { + else copy_len = min_t(int, sizeof(pstat->wpa_ie), wpa_ie_len+2); - } if (copy_len > 0) memcpy(pstat->wpa_ie, wpa_ie-2, copy_len); -- 2.52.0