[PATCH net-next] tipc: Return the correct errno code

[PATCH net-next] tipc: Return the correct errno code

[Zheng Yongjun]

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
 net/tipc/link.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/tipc/link.c b/net/tipc/link.c
index c44b4bfaaee6..5b6181277cc5 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -912,7 +912,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
 	skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
 			      dnode, l->addr, dport, 0, 0);
 	if (!skb)
-		return -ENOBUFS;
+		return -ENOMEM;
 	msg_set_dest_droppable(buf_msg(skb), true);
 	TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
 	skb_queue_tail(&l->wakeupq, skb);
@@ -1030,7 +1030,7 @@ void tipc_link_reset(struct tipc_link *l)
  *
  * Consumes the buffer chain.
  * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
- * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
+ * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS or -ENOMEM
  */
 int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
 		   struct sk_buff_head *xmitq)
@@ -1088,7 +1088,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
 			if (!_skb) {
 				kfree_skb(skb);
 				__skb_queue_purge(list);
-				return -ENOBUFS;
+				return -ENOMEM;
 			}
 			__skb_queue_tail(transmq, skb);
 			tipc_link_set_skb_retransmit_time(skb, l);
-- 
2.25.1

答复: [PATCH net-next] tipc: Return the correct errno code

[zhengyongjun]

Sorry, this patch is wrong, please ignore it, thanks :)

-----邮件原件-----
发件人: zhengyongjun 
发送时间: 2021年6月4日 9:47
收件人: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
抄送: zhengyongjun <zhengyongjun3@huawei.com>
主题: [PATCH net-next] tipc: Return the correct errno code

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
 net/tipc/link.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/tipc/link.c b/net/tipc/link.c index c44b4bfaaee6..5b6181277cc5 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -912,7 +912,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
 	skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
 			      dnode, l->addr, dport, 0, 0);
 	if (!skb)
-		return -ENOBUFS;
+		return -ENOMEM;
 	msg_set_dest_droppable(buf_msg(skb), true);
 	TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
 	skb_queue_tail(&l->wakeupq, skb);
@@ -1030,7 +1030,7 @@ void tipc_link_reset(struct tipc_link *l)
  *
  * Consumes the buffer chain.
  * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
- * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
+ * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS or 
+ -ENOMEM
  */
 int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
 		   struct sk_buff_head *xmitq)
@@ -1088,7 +1088,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
 			if (!_skb) {
 				kfree_skb(skb);
 				__skb_queue_purge(list);
-				return -ENOBUFS;
+				return -ENOMEM;
 			}
 			__skb_queue_tail(transmq, skb);
 			tipc_link_set_skb_retransmit_time(skb, l);
--
2.25.1

RE: [PATCH net-next] tipc: Return the correct errno code

[Hoang Huu Le]

Hi Zheng,

The patch was being merged by accident. Will have you planning to revert it?
We need to do ASAP since calling path tipc_node_xmit() -> tipc_link_xmit() broken as side effect.

Thanks,
hoang
> -----Original Message-----
> From: zhengyongjun <zhengyongjun3@huawei.com>
> Sent: Friday, June 4, 2021 8:35 AM
> To: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: 答复: [PATCH net-next] tipc: Return the correct errno code
> 
> Sorry, this patch is wrong, please ignore it, thanks :)
> 
> -----邮件原件-----
> 发件人: zhengyongjun
> 发送时间: 2021年6月4日 9:47
> 收件人: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> 抄送: zhengyongjun <zhengyongjun3@huawei.com>
> 主题: [PATCH net-next] tipc: Return the correct errno code
> 
> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
> 
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
>  net/tipc/link.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/tipc/link.c b/net/tipc/link.c index c44b4bfaaee6..5b6181277cc5 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -912,7 +912,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
>  	skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
>  			      dnode, l->addr, dport, 0, 0);
>  	if (!skb)
> -		return -ENOBUFS;
> +		return -ENOMEM;
>  	msg_set_dest_droppable(buf_msg(skb), true);
>  	TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
>  	skb_queue_tail(&l->wakeupq, skb);
> @@ -1030,7 +1030,7 @@ void tipc_link_reset(struct tipc_link *l)
>   *
>   * Consumes the buffer chain.
>   * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
> - * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
> + * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS or
> + -ENOMEM
>   */
>  int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
>  		   struct sk_buff_head *xmitq)
> @@ -1088,7 +1088,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
>  			if (!_skb) {
>  				kfree_skb(skb);
>  				__skb_queue_purge(list);
> -				return -ENOBUFS;
> +				return -ENOMEM;
>  			}
>  			__skb_queue_tail(transmq, skb);
>  			tipc_link_set_skb_retransmit_time(skb, l);
> --
> 2.25.1

答复: [PATCH net-next] tipc: Return the correct errno code

[zhengyongjun]

Hi hoang,

I don't notice that patch has been merged, If you need me to send a revert patch, I will send it as soon as possible.
If you submit the revert patch by your team, it's also ok. 

Thanks,
Zheng

-----邮件原件-----
发件人: Hoang Huu Le [mailto:hoang.h.le@dektech.com.au] 
发送时间: 2021年8月2日 16:02
收件人: zhengyongjun <zhengyongjun3@huawei.com>; jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
主题: RE: [PATCH net-next] tipc: Return the correct errno code

Hi Zheng,

The patch was being merged by accident. Will have you planning to revert it?
We need to do ASAP since calling path tipc_node_xmit() -> tipc_link_xmit() broken as side effect.

Thanks,
hoang
> -----Original Message-----
> From: zhengyongjun <zhengyongjun3@huawei.com>
> Sent: Friday, June 4, 2021 8:35 AM
> To: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; 
> kuba@kernel.org; netdev@vger.kernel.org; tipc- 
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: 答复: [PATCH net-next] tipc: Return the correct errno code
> 
> Sorry, this patch is wrong, please ignore it, thanks :)
> 
> -----邮件原件-----
> 发件人: zhengyongjun
> 发送时间: 2021年6月4日 9:47
> 收件人: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; 
> kuba@kernel.org; netdev@vger.kernel.org; tipc- 
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> 抄送: zhengyongjun <zhengyongjun3@huawei.com>
> 主题: [PATCH net-next] tipc: Return the correct errno code
> 
> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
> 
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
>  net/tipc/link.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/tipc/link.c b/net/tipc/link.c index 
> c44b4bfaaee6..5b6181277cc5 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -912,7 +912,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
>  	skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
>  			      dnode, l->addr, dport, 0, 0);
>  	if (!skb)
> -		return -ENOBUFS;
> +		return -ENOMEM;
>  	msg_set_dest_droppable(buf_msg(skb), true);
>  	TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
>  	skb_queue_tail(&l->wakeupq, skb);
> @@ -1030,7 +1030,7 @@ void tipc_link_reset(struct tipc_link *l)
>   *
>   * Consumes the buffer chain.
>   * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
> - * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
> + * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS 
> + or -ENOMEM
>   */
>  int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
>  		   struct sk_buff_head *xmitq)
> @@ -1088,7 +1088,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
>  			if (!_skb) {
>  				kfree_skb(skb);
>  				__skb_queue_purge(list);
> -				return -ENOBUFS;
> +				return -ENOMEM;
>  			}
>  			__skb_queue_tail(transmq, skb);
>  			tipc_link_set_skb_retransmit_time(skb, l);
> --
> 2.25.1

Re: [PATCH net-next] tipc: Return the correct errno code

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Fri, 4 Jun 2021 09:47:02 +0800 you wrote:
> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
> 
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
>  net/tipc/link.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Here is the summary with links:
  - [net-next] tipc: Return the correct errno code
    https://git.kernel.org/netdev/net-next/c/0efea3c649f0

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH net-next] tipc: Return the correct errno code

[YueHaibing]

On 2021/6/5 5:20, patchwork-bot+netdevbpf@kernel.org wrote:
> Hello:
> 
> This patch was applied to netdev/net-next.git (refs/heads/master):

This should not be applied.

tipc_node_xmit() now check -ENOBUFS rather than -ENOMEM.

Yongjun, maybe you fix this now?

> 
> On Fri, 4 Jun 2021 09:47:02 +0800 you wrote:
>> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
>>
>> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
>> ---
>>  net/tipc/link.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> Here is the summary with links:
>   - [net-next] tipc: Return the correct errno code
>     https://git.kernel.org/netdev/net-next/c/0efea3c649f0
> 
> You are awesome, thank you!
> --
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
> 
> 
> .
> 

答复: [PATCH net-next] tipc: Return the correct errno code

[zhengyongjun]

Thanks for your advice, I will fix it right now :)

-----邮件原件-----
发件人: yuehaibing 
发送时间: 2021年6月8日 10:16
收件人: patchwork-bot+netdevbpf@kernel.org; zhengyongjun <zhengyongjun3@huawei.com>
抄送: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
主题: Re: [PATCH net-next] tipc: Return the correct errno code


On 2021/6/5 5:20, patchwork-bot+netdevbpf@kernel.org wrote:
> Hello:
> 
> This patch was applied to netdev/net-next.git (refs/heads/master):

This should not be applied.

tipc_node_xmit() now check -ENOBUFS rather than -ENOMEM.

Yongjun, maybe you fix this now?

> 
> On Fri, 4 Jun 2021 09:47:02 +0800 you wrote:
>> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
>>
>> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
>> ---
>>  net/tipc/link.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> Here is the summary with links:
>   - [net-next] tipc: Return the correct errno code
>     https://git.kernel.org/netdev/net-next/c/0efea3c649f0
> 
> You are awesome, thank you!
> --
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
> 
> 
> .
> 

答复: [PATCH net-next] tipc: Return the correct errno code

[zhengyongjun]

Sorry again, I introduce a bug to kernel, I will do it carefully later.

-----邮件原件-----
发件人: yuehaibing 
发送时间: 2021年6月8日 10:16
收件人: patchwork-bot+netdevbpf@kernel.org; zhengyongjun <zhengyongjun3@huawei.com>
抄送: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
主题: Re: [PATCH net-next] tipc: Return the correct errno code


On 2021/6/5 5:20, patchwork-bot+netdevbpf@kernel.org wrote:
> Hello:
> 
> This patch was applied to netdev/net-next.git (refs/heads/master):

This should not be applied.

tipc_node_xmit() now check -ENOBUFS rather than -ENOMEM.

Yongjun, maybe you fix this now?

> 
> On Fri, 4 Jun 2021 09:47:02 +0800 you wrote:
>> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
>>
>> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
>> ---
>>  net/tipc/link.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> Here is the summary with links:
>   - [net-next] tipc: Return the correct errno code
>     https://git.kernel.org/netdev/net-next/c/0efea3c649f0
> 
> You are awesome, thank you!
> --
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
> 
> 
> .
>