Commit 80d326fa authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

netlink: add netlink_dump_control structure for netlink_dump_start() 



Davem considers that the argument list of this interface is getting
out of control. This patch tries to address this issue following
his proposal:

struct netlink_dump_control c = { .dump = dump, .done = done, ... };

netlink_dump_start(..., &c);

Suggested by David S. Miller.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48e316bc

crypto/crypto_user.c

+7 −3
Original line number Diff line number Diff line
@@ -389,9 +389,13 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	    (nlh->nlmsg_flags & NLM_F_DUMP))) {

		if (link->dump == NULL)

			return -EINVAL;



		return netlink_dump_start(crypto_nlsk, skb, nlh,

					  link->dump, link->done, 0);

		{

			struct netlink_dump_control c = {

				.dump = link->dump,

				.done = link->done,

			};

			return netlink_dump_start(crypto_nlsk, skb, nlh, &c);

		}

	}



	err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX,

drivers/infiniband/core/netlink.c

+7 −3
Original line number Diff line number Diff line
@@ -147,9 +147,13 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
			if (op < 0 || op >= client->nops ||

			    !client->cb_table[RDMA_NL_GET_OP(op)].dump)

				return -EINVAL;

			return netlink_dump_start(nls, skb, nlh,

						  client->cb_table[op].dump,

						  NULL, 0);



			{

				struct netlink_dump_control c = {

					.dump = client->cb_table[op].dump,

				};

				return netlink_dump_start(nls, skb, nlh, &c);

			}

		}

	}

include/linux/netlink.h

+7 −3
Original line number Diff line number Diff line
@@ -248,11 +248,15 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags) 
#define NLMSG_PUT(skb, pid, seq, type, len) \

	NLMSG_NEW(skb, pid, seq, type, len, 0)



struct netlink_dump_control {

	int (*dump)(struct sk_buff *skb, struct netlink_callback *);

	int (*done)(struct netlink_callback*);

	u16 min_dump_alloc;

};



extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,

			      const struct nlmsghdr *nlh,

			      int (*dump)(struct sk_buff *skb, struct netlink_callback*),

			      int (*done)(struct netlink_callback*),

			      u16 min_dump_alloc);

			      struct netlink_dump_control *control);





#define NL_NONROOT_RECV 0x1

net/core/rtnetlink.c

+7 −2
Original line number Diff line number Diff line
@@ -1981,8 +1981,13 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 


		__rtnl_unlock();

		rtnl = net->rtnl;

		err = netlink_dump_start(rtnl, skb, nlh, dumpit,

					 NULL, min_dump_alloc);

		{

			struct netlink_dump_control c = {

				.dump		= dumpit,

				.min_dump_alloc	= min_dump_alloc,

			};

			err = netlink_dump_start(rtnl, skb, nlh, &c);

		}

		rtnl_lock();

		return err;

	}

net/ipv4/inet_diag.c

+12 −6
Original line number Diff line number Diff line
@@ -960,9 +960,12 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh) 
			    inet_diag_bc_audit(nla_data(attr), nla_len(attr)))

				return -EINVAL;

		}



		return netlink_dump_start(sock_diag_nlsk, skb, nlh,

					  inet_diag_dump_compat, NULL, 0);

		{

			struct netlink_dump_control c = {

				.dump = inet_diag_dump_compat,

			};

			return netlink_dump_start(sock_diag_nlsk, skb, nlh, &c);

		}

	}



	return inet_diag_get_exact_compat(skb, nlh);
@@ -985,9 +988,12 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h) 
			    inet_diag_bc_audit(nla_data(attr), nla_len(attr)))

				return -EINVAL;

		}



		return netlink_dump_start(sock_diag_nlsk, skb, h,

					  inet_diag_dump, NULL, 0);

		{

			struct netlink_dump_control c = {

				.dump = inet_diag_dump,

			};

			return netlink_dump_start(sock_diag_nlsk, skb, h, &c);

		}

	}



	return inet_diag_get_exact(skb, h, (struct inet_diag_req_v2 *)NLMSG_DATA(h));

CRA Git | Maintained and supported by SUSTech CRA and CCSE