Commit ae0be8de authored by Michal Kubecek's avatar Michal Kubecek Committed by David S. Miller
Browse files

netlink: make nla_nest_start() add NLA_F_NESTED flag 



Even if the NLA_F_NESTED flag was introduced more than 11 years ago, most
netlink based interfaces (including recently added ones) are still not
setting it in kernel generated messages. Without the flag, message parsers
not aware of attribute semantics (e.g. wireshark dissector or libmnl's
mnl_nlmsg_fprintf()) cannot recognize nested attributes and won't display
the structure of their contents.

Unfortunately we cannot just add the flag everywhere as there may be
userspace applications which check nlattr::nla_type directly rather than
through a helper masking out the flags. Therefore the patch renames
nla_nest_start() to nla_nest_start_noflag() and introduces nla_nest_start()
as a wrapper adding NLA_F_NESTED. The calls which add NLA_F_NESTED manually
are rewritten to use nla_nest_start().

Except for changes in include/net/netlink.h, the patch was generated using
this semantic patch:

@@ expression E1, E2; @@
-nla_nest_start(E1, E2)
+nla_nest_start_noflag(E1, E2)

@@ expression E1, E2; @@
-nla_nest_start_noflag(E1, E2 | NLA_F_NESTED)
+nla_nest_start(E1, E2)

Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7881b4a

drivers/block/drbd/drbd_nl.c

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int drbd_msg_put_info(struct sk_buff *skb, const char *info) 
	if (!info || !info[0])

		return 0;



	nla = nla_nest_start(skb, DRBD_NLA_CFG_REPLY);

	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_REPLY);

	if (!nla)

		return err;
@@ -135,7 +135,7 @@ static int drbd_msg_sprintf_info(struct sk_buff *skb, const char *fmt, ...) 
	int err = -EMSGSIZE;

	int len;



	nla = nla_nest_start(skb, DRBD_NLA_CFG_REPLY);

	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_REPLY);

	if (!nla)

		return err;
@@ -3269,7 +3269,7 @@ static int nla_put_drbd_cfg_context(struct sk_buff *skb, 
				    struct drbd_device *device)

{

	struct nlattr *nla;

	nla = nla_nest_start(skb, DRBD_NLA_CFG_CONTEXT);

	nla = nla_nest_start_noflag(skb, DRBD_NLA_CFG_CONTEXT);

	if (!nla)

		goto nla_put_failure;

	if (device &&
@@ -3837,7 +3837,7 @@ static int nla_put_status_info(struct sk_buff *skb, struct drbd_device *device, 
	if (err)

		goto nla_put_failure;



	nla = nla_nest_start(skb, DRBD_NLA_STATE_INFO);

	nla = nla_nest_start_noflag(skb, DRBD_NLA_STATE_INFO);

	if (!nla)

		goto nla_put_failure;

	if (nla_put_u32(skb, T_sib_reason, sib ? sib->sib_reason : SIB_GET_STATUS_REPLY) ||

drivers/block/nbd.c

+2 −2
Original line number Diff line number Diff line
@@ -2047,7 +2047,7 @@ static int populate_nbd_status(struct nbd_device *nbd, struct sk_buff *reply) 
	 */

	if (refcount_read(&nbd->config_refs))

		connected = 1;

	dev_opt = nla_nest_start(reply, NBD_DEVICE_ITEM);

	dev_opt = nla_nest_start_noflag(reply, NBD_DEVICE_ITEM);

	if (!dev_opt)

		return -EMSGSIZE;

	ret = nla_put_u32(reply, NBD_DEVICE_INDEX, nbd->index);
@@ -2095,7 +2095,7 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	dev_list = nla_nest_start(reply, NBD_ATTR_DEVICE_LIST);

	dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST);

	if (index == -1) {

		ret = idr_for_each(&nbd_index_idr, &status_cb, reply);

		if (ret) {

drivers/infiniband/core/nldev.c

+5 −4
Original line number Diff line number Diff line
@@ -292,7 +292,8 @@ static int fill_res_info_entry(struct sk_buff *msg, 
{

	struct nlattr *entry_attr;



	entry_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY);

	entry_attr = nla_nest_start_noflag(msg,

					   RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY);

	if (!entry_attr)

		return -EMSGSIZE;
@@ -327,7 +328,7 @@ static int fill_res_info(struct sk_buff *msg, struct ib_device *device) 
	if (fill_nldev_handle(msg, device))

		return -EMSGSIZE;



	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_RES_SUMMARY);

	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_RES_SUMMARY);

	if (!table_attr)

		return -EMSGSIZE;
@@ -1108,7 +1109,7 @@ static int res_get_common_dumpit(struct sk_buff *skb, 
		goto err;

	}



	table_attr = nla_nest_start(skb, fe->nldev_attr);

	table_attr = nla_nest_start_noflag(skb, fe->nldev_attr);

	if (!table_attr) {

		ret = -EMSGSIZE;

		goto err;
@@ -1134,7 +1135,7 @@ static int res_get_common_dumpit(struct sk_buff *skb, 


		filled = true;



		entry_attr = nla_nest_start(skb, fe->entry);

		entry_attr = nla_nest_start_noflag(skb, fe->entry);

		if (!entry_attr) {

			ret = -EMSGSIZE;

			rdma_restrack_put(res);

drivers/infiniband/hw/cxgb4/restrack.c

+4 −4
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int fill_res_qp_entry(struct sk_buff *msg, 
	if (qhp->ucontext)

		return 0;



	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);

	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);

	if (!table_attr)

		goto err;
@@ -216,7 +216,7 @@ static int fill_res_ep_entry(struct sk_buff *msg, 
	if (!uep)

		return 0;



	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);

	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);

	if (!table_attr)

		goto err_free_uep;
@@ -387,7 +387,7 @@ static int fill_res_cq_entry(struct sk_buff *msg, 
	if (ibcq->uobject)

		return 0;



	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);

	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);

	if (!table_attr)

		goto err;
@@ -447,7 +447,7 @@ static int fill_res_mr_entry(struct sk_buff *msg, 
	if (!stag)

		return 0;



	table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);

	table_attr = nla_nest_start_noflag(msg, RDMA_NLDEV_ATTR_DRIVER);

	if (!table_attr)

		goto err;

drivers/net/bonding/bond_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int bond_fill_info(struct sk_buff *skb, 
	if (nla_put_u32(skb, IFLA_BOND_ARP_INTERVAL, bond->params.arp_interval))

		goto nla_put_failure;



	targets = nla_nest_start(skb, IFLA_BOND_ARP_IP_TARGET);

	targets = nla_nest_start_noflag(skb, IFLA_BOND_ARP_IP_TARGET);

	if (!targets)

		goto nla_put_failure;
@@ -644,7 +644,7 @@ static int bond_fill_info(struct sk_buff *skb, 
		if (!bond_3ad_get_active_agg_info(bond, &info)) {

			struct nlattr *nest;



			nest = nla_nest_start(skb, IFLA_BOND_AD_INFO);

			nest = nla_nest_start_noflag(skb, IFLA_BOND_AD_INFO);

			if (!nest)

				goto nla_put_failure;
@@ -711,7 +711,7 @@ static int bond_fill_linkxstats(struct sk_buff *skb, 
		return -EINVAL;

	}



	nest = nla_nest_start(skb, LINK_XSTATS_TYPE_BOND);

	nest = nla_nest_start_noflag(skb, LINK_XSTATS_TYPE_BOND);

	if (!nest)

		return -EMSGSIZE;

	if (BOND_MODE(bond) == BOND_MODE_8023AD) {
@@ -722,7 +722,7 @@ static int bond_fill_linkxstats(struct sk_buff *skb, 
		else

			stats = &BOND_AD_INFO(bond).stats;



		nest2 = nla_nest_start(skb, BOND_XSTATS_3AD);

		nest2 = nla_nest_start_noflag(skb, BOND_XSTATS_3AD);

		if (!nest2) {

			nla_nest_end(skb, nest);

			return -EMSGSIZE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE