diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-22 14:57:44 +1000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-22 21:39:08 -0700 |
| commit | 3d0371b313b84ba7c16ebf2526a7a34f1c57b19e (patch) | |
| tree | 9bc07854f920ac90f56189fd91a9f3bee6494745 /net/ncsi | |
| parent | 00e1cae78120ee19462e7f96135cd1cc59a086e7 (diff) | |
| download | linux-stable-3d0371b313b84ba7c16ebf2526a7a34f1c57b19e.tar.gz linux-stable-3d0371b313b84ba7c16ebf2526a7a34f1c57b19e.tar.bz2 linux-stable-3d0371b313b84ba7c16ebf2526a7a34f1c57b19e.zip | |
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 <sam@mendozajonas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ncsi')
| -rw-r--r-- | net/ncsi/ncsi-netlink.c | 4 |
1 files 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; |