From nobody Sun Feb 8 14:07:40 2026 Received: from cvsmtppost35.nm.naver.com (cvsmtppost35.nm.naver.com [114.111.35.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F5E735D5F6 for ; Thu, 22 Jan 2026 17:51:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.111.35.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769104318; cv=none; b=csqTdNSdX+S1cHfc0MiZcD4GJeH5xkDzyKvqFQniqwyIdJQAaohQc8Jpdbea9xgjSjp1rQH9p8ye2MB5yywD1JfXSIQ4jkRmhxJi7x0nfRHbHZt4IWSMl/mk50nx+c3Y12Be09WUgAG5kLYECEhoFIRWFzXwE1Ea8vrSc35vU4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769104318; c=relaxed/simple; bh=ebTewxwJixWWN6lNv+eDWJkVhQ2aL9l/Bl3iGYad+6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tGZBRwqkyiHL5N66ObzOlS3tjAe3GuVt1CmCPkrmQAQugEqDdk50hafkg7d9ggdo6sc4veiT4fucJRKHJN8bECV/OHRI8L8qU0OjE1322GUfuZm1L5QTUIK7GQZix8PLNenYyhs10gZoMg31c314NrYHfBGbl+s2SQAJ7Nce9AA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=naver.com; spf=pass smtp.mailfrom=naver.com; dkim=pass (2048-bit key) header.d=naver.com header.i=@naver.com header.b=HzfsqXhZ; arc=none smtp.client-ip=114.111.35.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=naver.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=naver.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=naver.com header.i=@naver.com header.b="HzfsqXhZ" Received: from cvsendbo022.nm ([10.112.20.47]) by cvsmtppost35.nm.naver.com with ESMTP id DLrsrWKlQLaB0qe2CF3LXA for ; Thu, 22 Jan 2026 17:41:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=naver.com; s=s20171208; t=1769103692; bh=ebTewxwJixWWN6lNv+eDWJkVhQ2aL9l/Bl3iGYad+6E=; h=From:To:Subject:Date:Message-ID:From:Subject:Feedback-ID: X-Works-Security; b=HzfsqXhZIeYGXFNZUeGNeWfN4d4FVim5sTCziyy93t8b2GaBb0BlK6/amOS5dAvwF lBHQxDMOEE0KWBaAlyGXHsLu5+gaHcNd6dv3AVun5DeOQ4qhed8GRehS1OXH+ImsZs 2l+AaoyIK+pdR6Gnn4YW/xrp2G3oJ8I8UbFFGxcUYAiGYrY2eWxla926JWlHSNjyvg dYCX7fV4VBVO3OWUt/dX1VUDzubdSi3aBpKSfvRT4XDs0LM9BO9YKSxKcV58zbdnma OzSCp8lZLA1QB0/kYJAVzQsQZB2V5mVGFnPzp5RLCVxE5qxm+vs0OWbAuqVGeN/Dyy //475U4ZgZw0Q== X-Session-ID: K3QjH0MzR0i1ZK3RumUcwA X-Works-Send-Opt: LdYwjAJYjHmZaAKqKBmmKxbwKqpYkEljxBmwjAg= X-Works-Smtp-Source: QZbXKAvrFqJZ+HmwaxUw+6E= Received: from JMW-Ubuntu.. ([14.38.141.199]) by cvnsmtp012.nm.naver.com with ESMTP id K3QjH0MzR0i1ZK3RumUcwA for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 22 Jan 2026 17:41:31 -0000 From: Minu Jin To: gregkh@linuxfoundation.org Cc: andriy.shevchenko@linux.intel.com, abrahamadekunle50@gmail.com, zxcv2569763104@gmail.com, milospuric856@gmail.com, karanja99erick@gmail.com, weibu@redadmin.org, dan.carpenter@linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Minu Jin Subject: [PATCH v6 1/2] staging: rtl8723bs: update _rtw_pktfile_read() to return error codes Date: Fri, 23 Jan 2026 02:41:24 +0900 Message-ID: <20260122174125.2567008-2-s9430939@naver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260122174125.2567008-1-s9430939@naver.com> References: <20260122174125.2567008-1-s9430939@naver.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The function _rtw_pktfile_read() currently returns a uint and clamps the requested read length if it exceeds the remaining data. This behavior makes it impossible to propagate error codes from internal calls like skb_copy_bits() and leads to incomplete data processing. This patch updates the function to: 1. Return -EINVAL if the remaining data is less than the requested leng= th, ensuring callers always get the full amount of data they expect. 2. Propagate the negative error code from skb_copy_bits(). 3. Change the return type from uint to int to support these error codes. To avoid breaking git bisect, this patch also updates all call sites (set_qos, update_attrib, and rtw_xmitframe_coalesce) in the same commit. By doing so, the error-producing function and its error-handling callers remain in sync, preventing runtime failures at this commit point. Signed-off-by: Minu Jin --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 44 ++++++++++++++----- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +-- .../staging/rtl8723bs/include/xmit_osdep.h | 2 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 21 +++++---- 4 files changed, 50 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 21690857fd62..13eb0e3eae62 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -596,23 +596,31 @@ u8 qos_acm(u8 acm_mask, u8 priority) return priority; } =20 -static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) +static int set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) { struct ethhdr etherhdr; struct iphdr ip_hdr; s32 UserPriority =3D 0; + int ret; =20 _rtw_open_pktfile(ppktfile->pkt, ppktfile); - _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); + ret =3D _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); + if (ret < 0) + return ret; =20 /* get UserPriority from IP hdr */ if (pattrib->ether_type =3D=3D 0x0800) { - _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); + ret =3D _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); + if (ret < 0) + return ret; + UserPriority =3D ip_hdr.tos >> 5; } pattrib->priority =3D UserPriority; pattrib->hdrlen =3D WLAN_HDR_A3_QOS_LEN; pattrib->subtype =3D WIFI_QOS_DATA_TYPE; + + return 0; } =20 static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, st= ruct pkt_attrib *pattrib) @@ -626,9 +634,12 @@ static s32 update_attrib(struct adapter *padapter, str= uct sk_buff *pkt, struct p struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct qos_priv *pqospriv =3D &pmlmepriv->qospriv; signed int res =3D _SUCCESS; + int ret; =20 _rtw_open_pktfile(pkt, &pktfile); - _rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN); + ret =3D _rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN); + if (ret < 0) + return ret; =20 pattrib->ether_type =3D ntohs(etherhdr.h_proto); =20 @@ -655,7 +666,9 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p =20 u8 tmp[24]; =20 - _rtw_pktfile_read(&pktfile, &tmp[0], 24); + ret =3D _rtw_pktfile_read(&pktfile, &tmp[0], 24); + if (ret < 0) + return ret; =20 pattrib->dhcp_pkt =3D 0; if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */ @@ -737,11 +750,16 @@ static s32 update_attrib(struct adapter *padapter, st= ruct sk_buff *pkt, struct p pattrib->priority =3D 0; =20 if (check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MA= STER_STATE)) { - if (pattrib->qos_en) - set_qos(&pktfile, pattrib); + if (pattrib->qos_en) { + ret =3D set_qos(&pktfile, pattrib); + if (ret < 0) + return ret; + } } else { if (pqospriv->qos_option) { - set_qos(&pktfile, pattrib); + ret =3D set_qos(&pktfile, pattrib); + if (ret < 0) + return ret; =20 if (pmlmepriv->acm_mask !=3D 0) pattrib->priority =3D qos_acm(pmlmepriv->acm_mask, pattrib->priority); @@ -1039,6 +1057,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 s32 bmcst =3D is_multicast_ether_addr(pattrib->ra); s32 res =3D _SUCCESS; + int ret; =20 if (!pxmitframe->buf_addr) return _FAIL; @@ -1054,7 +1073,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct } =20 _rtw_open_pktfile(pkt, &pktfile); - _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); + ret =3D _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); + if (ret < 0) + return ret; =20 frg_inx =3D 0; frg_len =3D pxmitpriv->frag_len - 4;/* 2346-4 =3D 2342 */ @@ -1096,6 +1117,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct mem_sz =3D _rtw_pktfile_read(&pktfile, pframe, mpdu_len); } =20 + if (mem_sz < 0) + return mem_sz; + pframe +=3D mem_sz; =20 if ((pattrib->icv_len > 0) && (pattrib->bswenc)) { @@ -1958,7 +1982,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff= **ppkt) =20 res =3D update_attrib(padapter, *ppkt, &pxmitframe->attrib); =20 - if (res =3D=3D _FAIL) { + if (res !=3D _SUCCESS) { rtw_free_xmitframe(pxmitpriv, pxmitframe); return -1; } diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index abb6fdfe7e1f..55df66ec5f4c 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -289,10 +289,10 @@ static s32 xmit_xmitframes(struct adapter *padapter, = struct xmit_priv *pxmitpriv pxmitframe->buf_addr =3D pxmitbuf->ptail; =20 ret =3D rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); - if (ret =3D=3D _FAIL) { + if (ret !=3D _SUCCESS) { netdev_err(padapter->pnetdev, - "%s: coalesce FAIL!", - __func__); + "%s: coalesce failed with error %d\n", + __func__, ret); /* Todo: error handler */ } else { k++; diff --git a/drivers/staging/rtl8723bs/include/xmit_osdep.h b/drivers/stagi= ng/rtl8723bs/include/xmit_osdep.h index 8704dced593a..13d86186904c 100644 --- a/drivers/staging/rtl8723bs/include/xmit_osdep.h +++ b/drivers/staging/rtl8723bs/include/xmit_osdep.h @@ -35,7 +35,7 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, = struct xmit_buf *pxmitb =20 extern uint rtw_remainder_len(struct pkt_file *pfile); extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); -extern uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); +int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); extern signed int rtw_endofpktfile(struct pkt_file *pfile); =20 extern void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *= pkt); diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/xmit_linux.c index 944b9c724b32..d6c2ae0b7385 100644 --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c @@ -21,19 +21,22 @@ void _rtw_open_pktfile(struct sk_buff *pktptr, struct p= kt_file *pfile) pfile->cur_buffer =3D pfile->buf_start; } =20 -uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) +int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) { - uint len =3D 0; + int ret; =20 - len =3D rtw_remainder_len(pfile); - len =3D (rlen > len) ? len : rlen; + if (rtw_remainder_len(pfile) < rlen) + return -EINVAL; =20 - if (rmem) - skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len); + if (rmem) { + ret =3D skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem,= rlen); + if (ret < 0) + return ret; + } =20 - pfile->cur_addr +=3D len; - pfile->pkt_len -=3D len; - return len; + pfile->cur_addr +=3D rlen; + pfile->pkt_len -=3D rlen; + return rlen; } =20 signed int rtw_endofpktfile(struct pkt_file *pfile) --=20 2.43.0 From nobody Sun Feb 8 14:07:40 2026 Received: from cvsmtppost01.nm.naver.com (cvsmtppost01.nm.naver.com [114.111.35.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D1833C07A for ; Thu, 22 Jan 2026 18:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.111.35.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769104915; cv=none; b=TxGHS/bQ6oS7XQptjpUzK2L0IauAbyGmcOlgDn0fst11Vvb8v10h/BggjLlL2XbkJz/XwYGn6NoW4Qxxa/QjSrsxdqwDS75Ua66cG6R/Zaf9WLwGsuY4YxFnAWmynqIKEA/S5tCTjaE1pyOtK08kflqJR3+ZOcoa5duZuxOWlSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769104915; c=relaxed/simple; bh=IhMBRhkbjTES2CAKhTOyV8cNpFmeZZg5OLA7JXnJQfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pfl7FPK5LZM0sXLlggMRzSlNMSdWrQdPNEIuQpD6v+6DJndim4dj9GeHcFWNYaPfvTkizGyp3+PGWvvfvYMAy3nleNzuDqxSV6CqOB6Zn+GQdaCHucMhBmaKaW+eY7woKczn6XIm18y1Z893HVpNxYZs8JSg0bN0Rf/p5ZQ2zzI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=naver.com; spf=pass smtp.mailfrom=naver.com; dkim=pass (2048-bit key) header.d=naver.com header.i=@naver.com header.b=KmYN5VrM; arc=none smtp.client-ip=114.111.35.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=naver.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=naver.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=naver.com header.i=@naver.com header.b="KmYN5VrM" Received: from cvsendbo029.nm ([10.112.18.60]) by cvsmtppost01.nm.naver.com with ESMTP id Pf4vhmiXQd2pXYI6ipB2sg for ; Thu, 22 Jan 2026 17:41:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=naver.com; s=s20171208; t=1769103694; bh=IhMBRhkbjTES2CAKhTOyV8cNpFmeZZg5OLA7JXnJQfE=; h=From:To:Subject:Date:Message-ID:From:Subject:Feedback-ID: X-Works-Security; b=KmYN5VrMA7Fdd0pZRTFZ6njrQZvq72xapzIEbr1Ha80lTc7Iky418jnEnPAq8900U QGIa+xznXLpNeKajN6WLOygiyaAqpNwod0D7vp5/NpxYY7N5xLWvlO1bCXvCmT2t/l XrpZDPjkUdYUzjg2SpByaiI997Hn2HYPXquwZnd70kQHv+gkDDRJUTbrpwxVVCizD+ Fhtcd4NALsw+CMDaj18qmUvi0G7a80K/YCjW5T4piXc1NUjlDXqs+7wTQEItBPXcTN P+D/WRMflVaU9ezw6yMr5SwcKRgxV2SfNjIA3EZGRZcfZOJnTH3DdnlKmnsdbxJy+9 2xUyPvanPYwCQ== X-Session-ID: xK3+Dfh8RaKJiVUh3zjmVQ X-Works-Send-Opt: LdYwjAJYjHmZaAKqKBmmKxbwKqpYkEljxBmwjAg= X-Works-Smtp-Source: QqKXKAvrFqJZ+HmdaxUw+6E= Received: from JMW-Ubuntu.. ([14.38.141.199]) by cvnsmtp012.nm.naver.com with ESMTP id xK3+Dfh8RaKJiVUh3zjmVQ for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 22 Jan 2026 17:41:34 -0000 From: Minu Jin To: gregkh@linuxfoundation.org Cc: andriy.shevchenko@linux.intel.com, abrahamadekunle50@gmail.com, zxcv2569763104@gmail.com, milospuric856@gmail.com, karanja99erick@gmail.com, weibu@redadmin.org, dan.carpenter@linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Minu Jin Subject: [PATCH v6 2/2] staging: rtl8723bs: clean up _rtw_pktfile_read() Date: Fri, 23 Jan 2026 02:41:25 +0900 Message-ID: <20260122174125.2567008-3-s9430939@naver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260122174125.2567008-1-s9430939@naver.com> References: <20260122174125.2567008-1-s9430939@naver.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Clean up the function by changing 'uint' to 'unsigned int' to comply with the kernel coding style, as suggested by Andy Shevchenko. Signed-off-by: Minu Jin --- drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/xmit_osdep.h b/drivers/stagi= ng/rtl8723bs/include/xmit_osdep.h index 13d86186904c..880344bffe2f 100644 --- a/drivers/staging/rtl8723bs/include/xmit_osdep.h +++ b/drivers/staging/rtl8723bs/include/xmit_osdep.h @@ -35,7 +35,7 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, = struct xmit_buf *pxmitb =20 extern uint rtw_remainder_len(struct pkt_file *pfile); extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); -int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); +int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, unsigned int rlen); extern signed int rtw_endofpktfile(struct pkt_file *pfile); =20 extern void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *= pkt); diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/stagin= g/rtl8723bs/os_dep/xmit_linux.c index d6c2ae0b7385..72cf8cd5f7c6 100644 --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c @@ -21,7 +21,7 @@ void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt= _file *pfile) pfile->cur_buffer =3D pfile->buf_start; } =20 -int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) +int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, unsigned int rlen) { int ret; =20 --=20 2.43.0