linux-staging.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry
@ 2022-09-12 21:45 Nathan Huckleberry
  2022-09-13  6:32 ` Nam Cao
  0 siblings, 1 reply; 6+ messages in thread
From: Nathan Huckleberry @ 2022-09-12 21:45 UTC (permalink / raw)
  Cc: Nathan Huckleberry, Dan Carpenter, llvm, Larry Finger,
	Phillip Potter, Pavel Skripkin, Greg Kroah-Hartman,
	Nathan Chancellor, Nick Desaulniers, Tom Rix, Ivan Safonov,
	Nam Cao, Saurav Girepunje, Vihas Makwana, linux-staging,
	linux-kernel

The ndo_start_xmit field in net_device_ops is expected to be of type
netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).

The mismatched return type breaks forward edge kCFI since the underlying
function definition does not match the function hook definition.

The return type of rtw_xmit_entry should be changed from int to
netdev_tx_t.

Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
---
 drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
index 91a1e4e3219a..0b04010d6d82 100644
--- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
@@ -198,7 +198,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
 	return true;
 }
 
-int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev)
+netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -233,5 +233,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev)
 
 exit:
 
-	return 0;
+	return NETDEV_TX_OK;
 }
-- 
2.37.2.789.g6183377224-goog


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry
  2022-09-12 21:45 [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry Nathan Huckleberry
@ 2022-09-13  6:32 ` Nam Cao
  2022-09-13 19:33   ` [PATCH v2] " Nathan Huckleberry
  0 siblings, 1 reply; 6+ messages in thread
From: Nam Cao @ 2022-09-13  6:32 UTC (permalink / raw)
  To: Nathan Huckleberry
  Cc: Dan Carpenter, llvm, Larry Finger, Phillip Potter,
	Pavel Skripkin, Greg Kroah-Hartman, Nathan Chancellor,
	Nick Desaulniers, Tom Rix, Ivan Safonov, Saurav Girepunje,
	Vihas Makwana, linux-staging, linux-kernel

On Mon, Sep 12, 2022 at 11:45 PM Nathan Huckleberry <nhuck@google.com> wrote:
>
> The ndo_start_xmit field in net_device_ops is expected to be of type
> netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).
>
> The mismatched return type breaks forward edge kCFI since the underlying
> function definition does not match the function hook definition.
>
> The return type of rtw_xmit_entry should be changed from int to
> netdev_tx_t.
>
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc: llvm@lists.linux.dev
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>

I am unable to apply your patch. I think because of this:
3e0a6c4414ac ("staging: r8188eu: remove os_dep/xmit_linux.c").

Can you update your git repo and resubmit?

Best regards,
Nam

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v2] staging: r8188eu: Fix return type of rtw_xmit_entry
  2022-09-13  6:32 ` Nam Cao
@ 2022-09-13 19:33   ` Nathan Huckleberry
  2022-09-13 23:16     ` Nathan Chancellor
  0 siblings, 1 reply; 6+ messages in thread
From: Nathan Huckleberry @ 2022-09-13 19:33 UTC (permalink / raw)
  To: namcaov
  Cc: Larry.Finger, error27, gregkh, insafonov, linux-kernel,
	linux-staging, llvm, makvihas, nathan, ndesaulniers, nhuck,
	paskripkin, phil, saurav.girepunje, trix

The ndo_start_xmit field in net_device_ops is expected to be of type
netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).

The mismatched return type breaks forward edge kCFI since the underlying
function definition does not match the function hook definition.

The return type of rtw_xmit_entry should be changed from int to
netdev_tx_t.

Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>

Changes v1 -> v2:
 - Rebased onto linux-next/master

---
 drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 98864fc55b25..ea13f11b231b 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
 	return true;
 }
 
-int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
+netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
 	dev_kfree_skb_any(pkt);
 
 exit:
-	return 0;
+	return NETDEV_TX_OK;
 }
-- 
2.37.2.789.g6183377224-goog


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2] staging: r8188eu: Fix return type of rtw_xmit_entry
  2022-09-13 19:33   ` [PATCH v2] " Nathan Huckleberry
@ 2022-09-13 23:16     ` Nathan Chancellor
  2022-09-14 21:16       ` [PATCH v3] " Nathan Huckleberry
  0 siblings, 1 reply; 6+ messages in thread
From: Nathan Chancellor @ 2022-09-13 23:16 UTC (permalink / raw)
  To: Nathan Huckleberry
  Cc: namcaov, Larry.Finger, error27, gregkh, insafonov, linux-kernel,
	linux-staging, llvm, makvihas, ndesaulniers, paskripkin, phil,
	saurav.girepunje, trix

On Tue, Sep 13, 2022 at 12:33:22PM -0700, Nathan Huckleberry wrote:
> The ndo_start_xmit field in net_device_ops is expected to be of type
> netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).
> 
> The mismatched return type breaks forward edge kCFI since the underlying
> function definition does not match the function hook definition.
> 
> The return type of rtw_xmit_entry should be changed from int to
> netdev_tx_t.
> 
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc: llvm@lists.linux.dev
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>

The prototype in drivers/staging/r8188eu/include/xmit_osdep.h should be
updated as well. With that:

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> Changes v1 -> v2:
>  - Rebased onto linux-next/master
> 
> ---
>  drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> index 98864fc55b25..ea13f11b231b 100644
> --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> @@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
>  	return true;
>  }
>  
> -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
> +netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
>  	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> @@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
>  	dev_kfree_skb_any(pkt);
>  
>  exit:
> -	return 0;
> +	return NETDEV_TX_OK;
>  }
> -- 
> 2.37.2.789.g6183377224-goog
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v3] staging: r8188eu: Fix return type of rtw_xmit_entry
  2022-09-13 23:16     ` Nathan Chancellor
@ 2022-09-14 21:16       ` Nathan Huckleberry
  2022-09-15  5:22         ` Philipp Hortmann
  0 siblings, 1 reply; 6+ messages in thread
From: Nathan Huckleberry @ 2022-09-14 21:16 UTC (permalink / raw)
  To: nathan
  Cc: Larry.Finger, error27, gregkh, insafonov, linux-kernel,
	linux-staging, llvm, makvihas, namcaov, ndesaulniers, nhuck,
	paskripkin, phil, saurav.girepunje, trix

The ndo_start_xmit field in net_device_ops is expected to be of type
netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).

The mismatched return type breaks forward edge kCFI since the underlying
function definition does not match the function hook definition.

The return type of rtw_xmit_entry should be changed from int to
netdev_tx_t.

Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
---

Changes v1 -> v2:
- Rebased onto linux-next/master

Changes v2 -> v3:
- Updated header file
- Add reviewed-by tag

 drivers/staging/r8188eu/core/rtw_xmit.c    | 4 ++--
 drivers/staging/r8188eu/include/rtw_xmit.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 98864fc55b25..ea13f11b231b 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
 	return true;
 }
 
-int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
+netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
 	dev_kfree_skb_any(pkt);
 
 exit:
-	return 0;
+	return NETDEV_TX_OK;
 }
diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index 8f54c41ba927..82efcd54af3f 100644
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -368,6 +368,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);
 void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);
 
 void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
-int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
+netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
 
 #endif	/* _RTL871X_XMIT_H_ */
-- 
2.37.2.789.g6183377224-goog


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v3] staging: r8188eu: Fix return type of rtw_xmit_entry
  2022-09-14 21:16       ` [PATCH v3] " Nathan Huckleberry
@ 2022-09-15  5:22         ` Philipp Hortmann
  0 siblings, 0 replies; 6+ messages in thread
From: Philipp Hortmann @ 2022-09-15  5:22 UTC (permalink / raw)
  To: Nathan Huckleberry, nathan
  Cc: Larry.Finger, error27, gregkh, insafonov, linux-kernel,
	linux-staging, llvm, makvihas, namcaov, ndesaulniers, paskripkin,
	phil, saurav.girepunje, trix

On 9/14/22 23:16, Nathan Huckleberry wrote:
> The ndo_start_xmit field in net_device_ops is expected to be of type
> netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev).
> 
> The mismatched return type breaks forward edge kCFI since the underlying
> function definition does not match the function hook definition.
> 
> The return type of rtw_xmit_entry should be changed from int to
> netdev_tx_t.
> 
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc: llvm@lists.linux.dev
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> 
> Changes v1 -> v2:
> - Rebased onto linux-next/master
> 
> Changes v2 -> v3:
> - Updated header file
> - Add reviewed-by tag
> 
>   drivers/staging/r8188eu/core/rtw_xmit.c    | 4 ++--
>   drivers/staging/r8188eu/include/rtw_xmit.h | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> index 98864fc55b25..ea13f11b231b 100644
> --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> @@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
>   	return true;
>   }
>   
> -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
> +netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
>   {
>   	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
>   	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
> @@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
>   	dev_kfree_skb_any(pkt);
>   
>   exit:
> -	return 0;
> +	return NETDEV_TX_OK;
>   }
> diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
> index 8f54c41ba927..82efcd54af3f 100644
> --- a/drivers/staging/r8188eu/include/rtw_xmit.h
> +++ b/drivers/staging/r8188eu/include/rtw_xmit.h
> @@ -368,6 +368,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);
>   void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);
>   
>   void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
> -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
> +netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
>   
>   #endif	/* _RTL871X_XMIT_H_ */

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-15  5:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-12 21:45 [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry Nathan Huckleberry
2022-09-13  6:32 ` Nam Cao
2022-09-13 19:33   ` [PATCH v2] " Nathan Huckleberry
2022-09-13 23:16     ` Nathan Chancellor
2022-09-14 21:16       ` [PATCH v3] " Nathan Huckleberry
2022-09-15  5:22         ` Philipp Hortmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).