diff mbox

[net-next] devlink: fix return value check in devlink_dpipe_header_put()

Message ID 20170410131106.27683-1-weiyj.lk@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Wei Yongjun April 10, 2017, 1:11 p.m. UTC
From: Wei Yongjun <weiyongjun1@huawei.com>

Fix the retrn value check which testing the wrong variable
in devlink_dpipe_header_put().

Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 net/core/devlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Pirko April 11, 2017, 6:39 a.m. UTC | #1
Mon, Apr 10, 2017 at 03:11:06PM CEST, weiyj.lk@gmail.com wrote:
>From: Wei Yongjun <weiyongjun1@huawei.com>
>
>Fix the retrn value check which testing the wrong variable

         ^^^^^ typo

Otherwise,
Acked-by: Jiri Pirko <jiri@mellanox.com>


>in devlink_dpipe_header_put().
>
>Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
>Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
>---
> net/core/devlink.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/net/core/devlink.c b/net/core/devlink.c
>index 24b7660..0afac58 100644
>--- a/net/core/devlink.c
>+++ b/net/core/devlink.c
>@@ -2031,7 +2031,7 @@ static int devlink_dpipe_header_put(struct sk_buff *skb,
> 	int err;
> 
> 	header_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADER);
>-	if (!header)
>+	if (!header_attr)
> 		return -EMSGSIZE;
> 
> 	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_HEADER_NAME, header->name) ||
>
David Miller April 12, 2017, 3:03 a.m. UTC | #2
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Mon, 10 Apr 2017 13:11:06 +0000

> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> Fix the retrn value check which testing the wrong variable
> in devlink_dpipe_header_put().
> 
> Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

This doesn't apply cleanly to net-next, please respin and also fix
the typo in your commit message as pointed out by Jiri.
Wei Yongjun April 12, 2017, 3:30 a.m. UTC | #3
Hi David,

> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Wednesday, April 12, 2017 11:03 AM
> To: weiyj.lk@gmail.com
> Cc: jiri@mellanox.com; arkadis@mellanox.com; weiyongjun (A)
> <weiyongjun1@huawei.com>; netdev@vger.kernel.org
> Subject: Re: [PATCH net-next] devlink: fix return value check in
> devlink_dpipe_header_put()
> 
> From: Wei Yongjun <weiyj.lk@gmail.com>
> Date: Mon, 10 Apr 2017 13:11:06 +0000
> 
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> >
> > Fix the retrn value check which testing the wrong variable
> > in devlink_dpipe_header_put().
> >
> > Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> 
> This doesn't apply cleanly to net-next, please respin and also fix
> the typo in your commit message as pointed out by Jiri.

You have applied the v2 version of this patch some hours ago.  

Regards,
Yongjun Wei
David Miller April 12, 2017, 2:19 p.m. UTC | #4
From: "weiyongjun (A)" <weiyongjun1@huawei.com>
Date: Wed, 12 Apr 2017 03:30:25 +0000

> Hi David,
> 
>> -----Original Message-----
>> From: David Miller [mailto:davem@davemloft.net]
>> Sent: Wednesday, April 12, 2017 11:03 AM
>> To: weiyj.lk@gmail.com
>> Cc: jiri@mellanox.com; arkadis@mellanox.com; weiyongjun (A)
>> <weiyongjun1@huawei.com>; netdev@vger.kernel.org
>> Subject: Re: [PATCH net-next] devlink: fix return value check in
>> devlink_dpipe_header_put()
>> 
>> From: Wei Yongjun <weiyj.lk@gmail.com>
>> Date: Mon, 10 Apr 2017 13:11:06 +0000
>> 
>> > From: Wei Yongjun <weiyongjun1@huawei.com>
>> >
>> > Fix the retrn value check which testing the wrong variable
>> > in devlink_dpipe_header_put().
>> >
>> > Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
>> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
>> 
>> This doesn't apply cleanly to net-next, please respin and also fix
>> the typo in your commit message as pointed out by Jiri.
> 
> You have applied the v2 version of this patch some hours ago.  

Aha, my bad.  Thanks!
diff mbox

Patch

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 24b7660..0afac58 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -2031,7 +2031,7 @@  static int devlink_dpipe_header_put(struct sk_buff *skb,
 	int err;
 
 	header_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADER);
-	if (!header)
+	if (!header_attr)
 		return -EMSGSIZE;
 
 	if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_HEADER_NAME, header->name) ||