2018-08-22 04:59:33

by Samuel Mendoza-Jonas

Subject: [PATCH net] net/ncsi: Fixup .dumpit message flags and ID check in Netlink handler

The ncsi_pkg_info_all_nl() .dumpit handler is missing the NLM_F_MULTI
flag, causing additional package information after the first to be lost.
Also fixup a sanity check in ncsi_write_package_info() to reject out of
range package IDs.

Signed-off-by: Samuel Mendoza-Jonas <[email protected]>
---
net/ncsi/ncsi-netlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c
index 82e6edf9c5d9..45f33d6dedf7 100644
--- a/net/ncsi/ncsi-netlink.c
+++ b/net/ncsi/ncsi-netlink.c
@@ -100,7 +100,7 @@ static int ncsi_write_package_info(struct sk_buff *skb,
bool found;
int rc;

- if (id > ndp->package_num) {
+ if (id > ndp->package_num - 1) {
netdev_info(ndp->ndev.dev, "NCSI: No package with id %u\n", id);
return -ENODEV;
}
@@ -240,7 +240,7 @@ static int ncsi_pkg_info_all_nl(struct sk_buff *skb,
return 0; /* done */

hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
- &ncsi_genl_family, 0, NCSI_CMD_PKG_INFO);
+ &ncsi_genl_family, NLM_F_MULTI, NCSI_CMD_PKG_INFO);
if (!hdr) {
rc = -EMSGSIZE;
goto err;
--
2.18.0

2018-08-23 04:41:22

by David Miller

Subject: Re: [PATCH net] net/ncsi: Fixup .dumpit message flags and ID check in Netlink handler

From: Samuel Mendoza-Jonas <[email protected]>
Date: Wed, 22 Aug 2018 14:57:44 +1000

> The ncsi_pkg_info_all_nl() .dumpit handler is missing the NLM_F_MULTI
> flag, causing additional package information after the first to be lost.
> Also fixup a sanity check in ncsi_write_package_info() to reject out of
> range package IDs.
>
> Signed-off-by: Samuel Mendoza-Jonas <[email protected]>

Applied.