* [PATCH 1/2 net] devlink: Fix some error codes
@ 2020-10-26 8:00 Dan Carpenter
2020-10-26 8:01 ` [PATCH 2/2 net] devlink: Unlock on error in dumpit() Dan Carpenter
2020-10-28 0:12 ` [PATCH 1/2 net] devlink: Fix some error codes Jakub Kicinski
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-10-26 8:00 UTC (permalink / raw)
To: Jiri Pirko, Andrew Lunn
Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors
These paths don't set the error codes. It's especially important in
devlink_nl_region_notify_build() where it leads to a NULL dereference in
the caller.
Fixes: 544e7c33ec2f ("net: devlink: Add support for port regions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
net/core/devlink.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index a578634052a3..925da7c0fcf3 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -4213,10 +4213,12 @@ static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,
if (err)
goto nla_put_failure;
- if (region->port)
- if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
- region->port->index))
+ if (region->port) {
+ err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
+ region->port->index);
+ if (err)
goto nla_put_failure;
+ }
err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, region->ops->name);
if (err)
@@ -4265,10 +4267,12 @@ devlink_nl_region_notify_build(struct devlink_region *region,
if (err)
goto out_cancel_msg;
- if (region->port)
- if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
- region->port->index))
+ if (region->port) {
+ err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
+ region->port->index);
+ if (err)
goto out_cancel_msg;
+ }
err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME,
region->ops->name);
@@ -4962,10 +4966,12 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
if (err)
goto nla_put_failure;
- if (region->port)
- if (nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX,
- region->port->index))
+ if (region->port) {
+ err = nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX,
+ region->port->index);
+ if (err)
goto nla_put_failure;
+ }
err = nla_put_string(skb, DEVLINK_ATTR_REGION_NAME, region_name);
if (err)
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2 net] devlink: Unlock on error in dumpit()
2020-10-26 8:00 [PATCH 1/2 net] devlink: Fix some error codes Dan Carpenter
@ 2020-10-26 8:01 ` Dan Carpenter
2020-10-28 0:12 ` [PATCH 1/2 net] devlink: Fix some error codes Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-10-26 8:01 UTC (permalink / raw)
To: Jiri Pirko, Andrew Lunn
Cc: David S. Miller, Jakub Kicinski, netdev, kernel-janitors
This needs to unlock before returning.
Fixes: 544e7c33ec2f ("net: devlink: Add support for port regions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
net/core/devlink.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 039f7bd8bf28..8b0e1c318e8d 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -4919,8 +4919,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
index = nla_get_u32(info->attrs[DEVLINK_ATTR_PORT_INDEX]);
port = devlink_port_get_by_index(devlink, index);
- if (!port)
- return -ENODEV;
+ if (!port) {
+ err = -ENODEV;
+ goto out_unlock;
+ }
}
region_name = nla_data(attrs[DEVLINK_ATTR_REGION_NAME]);
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2 net] devlink: Fix some error codes
2020-10-26 8:00 [PATCH 1/2 net] devlink: Fix some error codes Dan Carpenter
2020-10-26 8:01 ` [PATCH 2/2 net] devlink: Unlock on error in dumpit() Dan Carpenter
@ 2020-10-28 0:12 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-10-28 0:12 UTC (permalink / raw)
To: Dan Carpenter
Cc: Jiri Pirko, Andrew Lunn, David S. Miller, netdev, kernel-janitors
On Mon, 26 Oct 2020 11:00:59 +0300 Dan Carpenter wrote:
> devlink_nl_region_notify_build() where it leads to a NULL dereference in
> the caller.
>
> Fixes: 544e7c33ec2f ("net: devlink: Add support for port regions")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied both, thanks Dan!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-28 0:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-26 8:00 [PATCH 1/2 net] devlink: Fix some error codes Dan Carpenter
2020-10-26 8:01 ` [PATCH 2/2 net] devlink: Unlock on error in dumpit() Dan Carpenter
2020-10-28 0:12 ` [PATCH 1/2 net] devlink: Fix some error codes Jakub Kicinski
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).