net/ncsi: Fixup .dumpit message flags and ID check in Netlink handler (3d0371b3) · Commits · 戴 / test

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>

net/ncsi/ncsi-netlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message