Commit 04ba724b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink: extended ACK reporting 



Pass down struct netlink_ext_ack as parameter to all of our nfnetlink
subsystem callbacks, so we can work on follow up patches to provide
finer grain error reporting using the new infrastructure that
2d4bc933 ("netlink: extended ACK reporting") provides.

No functional change, just pass down this new object to callbacks.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d8297d4f

include/linux/netfilter/nfnetlink.h

+6 −4
Original line number Diff line number Diff line 
#ifndef _NFNETLINK_H

#define _NFNETLINK_H





#include <linux/netlink.h>

#include <linux/capability.h>

#include <net/netlink.h>
@@ -10,13 +9,16 @@ 
struct nfnl_callback {

	int (*call)(struct net *net, struct sock *nl, struct sk_buff *skb,

		    const struct nlmsghdr *nlh,

		    const struct nlattr * const cda[]);

		    const struct nlattr * const cda[],

		    struct netlink_ext_ack *extack);

	int (*call_rcu)(struct net *net, struct sock *nl, struct sk_buff *skb,

			const struct nlmsghdr *nlh,

			const struct nlattr * const cda[]);

			const struct nlattr * const cda[],

			struct netlink_ext_ack *extack);

	int (*call_batch)(struct net *net, struct sock *nl, struct sk_buff *skb,

			  const struct nlmsghdr *nlh,

			  const struct nlattr * const cda[]);

			  const struct nlattr * const cda[],

			  struct netlink_ext_ack *extack);

	const struct nla_policy *policy;	/* netlink attribute policy */

	const u_int16_t attr_count;		/* number of nlattr's */

};

net/netfilter/ipset/ip_set_core.c

+26 −13
Original line number Diff line number Diff line
@@ -841,14 +841,16 @@ find_free_id(struct ip_set_net *inst, const char *name, ip_set_id_t *index, 


static int ip_set_none(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	return -EOPNOTSUPP;

}



static int ip_set_create(struct net *net, struct sock *ctnl,

			 struct sk_buff *skb, const struct nlmsghdr *nlh,

			 const struct nlattr * const attr[])

			 const struct nlattr * const attr[],

			 struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *set, *clash = NULL;
@@ -989,7 +991,8 @@ ip_set_destroy_set(struct ip_set *set) 


static int ip_set_destroy(struct net *net, struct sock *ctnl,

			  struct sk_buff *skb, const struct nlmsghdr *nlh,

			  const struct nlattr * const attr[])

			  const struct nlattr * const attr[],

			  struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *s;
@@ -1067,7 +1070,8 @@ ip_set_flush_set(struct ip_set *set) 


static int ip_set_flush(struct net *net, struct sock *ctnl, struct sk_buff *skb,

			const struct nlmsghdr *nlh,

			const struct nlattr * const attr[])

			const struct nlattr * const attr[],

			struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *s;
@@ -1106,7 +1110,8 @@ ip_set_setname2_policy[IPSET_ATTR_CMD_MAX + 1] = { 


static int ip_set_rename(struct net *net, struct sock *ctnl,

			 struct sk_buff *skb, const struct nlmsghdr *nlh,

			 const struct nlattr * const attr[])

			 const struct nlattr * const attr[],

			 struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *set, *s;
@@ -1155,7 +1160,8 @@ out: 


static int ip_set_swap(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *from, *to;
@@ -1428,7 +1434,8 @@ out: 


static int ip_set_dump(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	if (unlikely(protocol_failed(attr)))

		return -IPSET_ERR_PROTOCOL;
@@ -1513,7 +1520,8 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set, 


static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *set;
@@ -1567,7 +1575,8 @@ static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb, 


static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *set;
@@ -1621,7 +1630,8 @@ static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb, 


static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,

			const struct nlmsghdr *nlh,

			const struct nlattr * const attr[])

			const struct nlattr * const attr[],

			struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	struct ip_set *set;
@@ -1656,7 +1666,8 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb, 


static int ip_set_header(struct net *net, struct sock *ctnl,

			 struct sk_buff *skb, const struct nlmsghdr *nlh,

			 const struct nlattr * const attr[])

			 const struct nlattr * const attr[],

			 struct netlink_ext_ack *extack)

{

	struct ip_set_net *inst = ip_set_pernet(net);

	const struct ip_set *set;
@@ -1712,7 +1723,8 @@ static const struct nla_policy ip_set_type_policy[IPSET_ATTR_CMD_MAX + 1] = { 


static int ip_set_type(struct net *net, struct sock *ctnl, struct sk_buff *skb,

		       const struct nlmsghdr *nlh,

		       const struct nlattr * const attr[])

		       const struct nlattr * const attr[],

		       struct netlink_ext_ack *extack)

{

	struct sk_buff *skb2;

	struct nlmsghdr *nlh2;
@@ -1770,7 +1782,8 @@ ip_set_protocol_policy[IPSET_ATTR_CMD_MAX + 1] = { 


static int ip_set_protocol(struct net *net, struct sock *ctnl,

			   struct sk_buff *skb, const struct nlmsghdr *nlh,

			   const struct nlattr * const attr[])

			   const struct nlattr * const attr[],

			   struct netlink_ext_ack *extack)

{

	struct sk_buff *skb2;

	struct nlmsghdr *nlh2;

net/netfilter/nf_conntrack_netlink.c

+26 −13
Original line number Diff line number Diff line
@@ -1127,7 +1127,8 @@ static int ctnetlink_flush_conntrack(struct net *net, 
static int ctnetlink_del_conntrack(struct net *net, struct sock *ctnl,

				   struct sk_buff *skb,

				   const struct nlmsghdr *nlh,

				   const struct nlattr * const cda[])

				   const struct nlattr * const cda[],

				   struct netlink_ext_ack *extack)

{

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;
@@ -1179,7 +1180,8 @@ static int ctnetlink_del_conntrack(struct net *net, struct sock *ctnl, 
static int ctnetlink_get_conntrack(struct net *net, struct sock *ctnl,

				   struct sk_buff *skb,

				   const struct nlmsghdr *nlh,

				   const struct nlattr * const cda[])

				   const struct nlattr * const cda[],

				   struct netlink_ext_ack *extack)

{

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;
@@ -1340,7 +1342,8 @@ ctnetlink_dump_dying(struct sk_buff *skb, struct netlink_callback *cb) 
static int ctnetlink_get_ct_dying(struct net *net, struct sock *ctnl,

				  struct sk_buff *skb,

				  const struct nlmsghdr *nlh,

				  const struct nlattr * const cda[])

				  const struct nlattr * const cda[],

				  struct netlink_ext_ack *extack)

{

	if (nlh->nlmsg_flags & NLM_F_DUMP) {

		struct netlink_dump_control c = {
@@ -1362,7 +1365,8 @@ ctnetlink_dump_unconfirmed(struct sk_buff *skb, struct netlink_callback *cb) 
static int ctnetlink_get_ct_unconfirmed(struct net *net, struct sock *ctnl,

					struct sk_buff *skb,

					const struct nlmsghdr *nlh,

					const struct nlattr * const cda[])

					const struct nlattr * const cda[],

					struct netlink_ext_ack *extack)

{

	if (nlh->nlmsg_flags & NLM_F_DUMP) {

		struct netlink_dump_control c = {
@@ -1901,7 +1905,8 @@ err1: 
static int ctnetlink_new_conntrack(struct net *net, struct sock *ctnl,

				   struct sk_buff *skb,

				   const struct nlmsghdr *nlh,

				   const struct nlattr * const cda[])

				   const struct nlattr * const cda[],

				   struct netlink_ext_ack *extack)

{

	struct nf_conntrack_tuple otuple, rtuple;

	struct nf_conntrack_tuple_hash *h = NULL;
@@ -2066,7 +2071,8 @@ ctnetlink_ct_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb) 
static int ctnetlink_stat_ct_cpu(struct net *net, struct sock *ctnl,

				 struct sk_buff *skb,

				 const struct nlmsghdr *nlh,

				 const struct nlattr * const cda[])

				 const struct nlattr * const cda[],

				 struct netlink_ext_ack *extack)

{

	if (nlh->nlmsg_flags & NLM_F_DUMP) {

		struct netlink_dump_control c = {
@@ -2111,7 +2117,8 @@ nlmsg_failure: 


static int ctnetlink_stat_ct(struct net *net, struct sock *ctnl,

			     struct sk_buff *skb, const struct nlmsghdr *nlh,

			     const struct nlattr * const cda[])

			     const struct nlattr * const cda[],

			     struct netlink_ext_ack *extack)

{

	struct sk_buff *skb2;

	int err;
@@ -2773,7 +2780,8 @@ out: 
static int ctnetlink_dump_exp_ct(struct net *net, struct sock *ctnl,

				 struct sk_buff *skb,

				 const struct nlmsghdr *nlh,

				 const struct nlattr * const cda[])

				 const struct nlattr * const cda[],

				 struct netlink_ext_ack *extack)

{

	int err;

	struct nfgenmsg *nfmsg = nlmsg_data(nlh);
@@ -2817,7 +2825,8 @@ static int ctnetlink_dump_exp_ct(struct net *net, struct sock *ctnl, 


static int ctnetlink_get_expect(struct net *net, struct sock *ctnl,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const cda[])

				const struct nlattr * const cda[],

				struct netlink_ext_ack *extack)

{

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_expect *exp;
@@ -2829,7 +2838,8 @@ static int ctnetlink_get_expect(struct net *net, struct sock *ctnl, 


	if (nlh->nlmsg_flags & NLM_F_DUMP) {

		if (cda[CTA_EXPECT_MASTER])

			return ctnetlink_dump_exp_ct(net, ctnl, skb, nlh, cda);

			return ctnetlink_dump_exp_ct(net, ctnl, skb, nlh, cda,

						     extack);

		else {

			struct netlink_dump_control c = {

				.dump = ctnetlink_exp_dump_table,
@@ -2897,7 +2907,8 @@ out: 


static int ctnetlink_del_expect(struct net *net, struct sock *ctnl,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const cda[])

				const struct nlattr * const cda[],

				struct netlink_ext_ack *extack)

{

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_tuple tuple;
@@ -3185,7 +3196,8 @@ err_ct: 


static int ctnetlink_new_expect(struct net *net, struct sock *ctnl,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const cda[])

				const struct nlattr * const cda[],

				struct netlink_ext_ack *extack)

{

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_expect *exp;
@@ -3291,7 +3303,8 @@ ctnetlink_exp_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb) 
static int ctnetlink_stat_exp_cpu(struct net *net, struct sock *ctnl,

				  struct sk_buff *skb,

				  const struct nlmsghdr *nlh,

				  const struct nlattr * const cda[])

				  const struct nlattr * const cda[],

				  struct netlink_ext_ack *extack)

{

	if (nlh->nlmsg_flags & NLM_F_DUMP) {

		struct netlink_dump_control c = {

net/netfilter/nf_tables_api.c

+39 −20
Original line number Diff line number Diff line
@@ -535,7 +535,8 @@ done: 


static int nf_tables_gettable(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_cur(net);
@@ -678,7 +679,8 @@ err: 


static int nf_tables_newtable(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -831,7 +833,8 @@ out: 


static int nf_tables_deltable(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -1127,7 +1130,8 @@ done: 


static int nf_tables_getchain(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_cur(net);
@@ -1323,7 +1327,8 @@ static void nft_chain_release_hook(struct nft_chain_hook *hook) 


static int nf_tables_newchain(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	const struct nlattr * uninitialized_var(name);
@@ -1561,7 +1566,8 @@ err1: 


static int nf_tables_delchain(struct net *net, struct sock *nlsk,

			      struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			      const struct nlattr * const nla[],

			      struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -2042,7 +2048,8 @@ static int nf_tables_dump_rules_done(struct netlink_callback *cb) 


static int nf_tables_getrule(struct net *net, struct sock *nlsk,

			     struct sk_buff *skb, const struct nlmsghdr *nlh,

			     const struct nlattr * const nla[])

			     const struct nlattr * const nla[],

			     struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_cur(net);
@@ -2135,7 +2142,8 @@ static struct nft_expr_info *info; 


static int nf_tables_newrule(struct net *net, struct sock *nlsk,

			     struct sk_buff *skb, const struct nlmsghdr *nlh,

			     const struct nlattr * const nla[])

			     const struct nlattr * const nla[],

			     struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -2317,7 +2325,8 @@ static struct nft_rule *nft_rule_lookup_byid(const struct net *net, 


static int nf_tables_delrule(struct net *net, struct sock *nlsk,

			     struct sk_buff *skb, const struct nlmsghdr *nlh,

			     const struct nlattr * const nla[])

			     const struct nlattr * const nla[],

			     struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -2833,7 +2842,8 @@ static int nf_tables_dump_sets_done(struct netlink_callback *cb) 


static int nf_tables_getset(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	u8 genmask = nft_genmask_cur(net);

	const struct nft_set *set;
@@ -2909,7 +2919,8 @@ static int nf_tables_set_desc_parse(const struct nft_ctx *ctx, 


static int nf_tables_newset(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -3127,7 +3138,8 @@ static void nf_tables_set_destroy(const struct nft_ctx *ctx, struct nft_set *set 


static int nf_tables_delset(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -3487,7 +3499,8 @@ static int nf_tables_dump_set_done(struct netlink_callback *cb) 


static int nf_tables_getsetelem(struct net *net, struct sock *nlsk,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const nla[])

				const struct nlattr * const nla[],

				struct netlink_ext_ack *extack)

{

	u8 genmask = nft_genmask_cur(net);

	const struct nft_set *set;
@@ -3888,7 +3901,8 @@ err1: 


static int nf_tables_newsetelem(struct net *net, struct sock *nlsk,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const nla[])

				const struct nlattr * const nla[],

				struct netlink_ext_ack *extack)

{

	u8 genmask = nft_genmask_next(net);

	const struct nlattr *attr;
@@ -4085,7 +4099,8 @@ err1: 


static int nf_tables_delsetelem(struct net *net, struct sock *nlsk,

				struct sk_buff *skb, const struct nlmsghdr *nlh,

				const struct nlattr * const nla[])

				const struct nlattr * const nla[],

				struct netlink_ext_ack *extack)

{

	u8 genmask = nft_genmask_next(net);

	const struct nlattr *attr;
@@ -4295,7 +4310,8 @@ static const struct nft_object_type *nft_obj_type_get(u32 objtype) 


static int nf_tables_newobj(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	const struct nft_object_type *type;
@@ -4489,7 +4505,8 @@ nft_obj_filter_alloc(const struct nlattr * const nla[]) 


static int nf_tables_getobj(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_cur(net);
@@ -4568,7 +4585,8 @@ static void nft_obj_destroy(struct nft_object *obj) 


static int nf_tables_delobj(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			      const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	const struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u8 genmask = nft_genmask_next(net);
@@ -4698,7 +4716,8 @@ err: 


static int nf_tables_getgen(struct net *net, struct sock *nlsk,

			    struct sk_buff *skb, const struct nlmsghdr *nlh,

			    const struct nlattr * const nla[])

			    const struct nlattr * const nla[],

			    struct netlink_ext_ack *extack)

{

	struct sk_buff *skb2;

	int err;

net/netfilter/nfnetlink.c

+15 −6
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ replay: 


		if (nc->call_rcu) {

			err = nc->call_rcu(net, net->nfnl, skb, nlh,

					   (const struct nlattr **)cda);

					   (const struct nlattr **)cda,

					   extack);

			rcu_read_unlock();

		} else {

			rcu_read_unlock();
@@ -211,7 +212,8 @@ replay: 
				err = -EAGAIN;

			else if (nc->call)

				err = nc->call(net, net->nfnl, skb, nlh,

					       (const struct nlattr **)cda);

					       (const struct nlattr **)cda,

					       extack);

			else

				err = -EINVAL;

			nfnl_unlock(subsys_id);
@@ -226,9 +228,11 @@ struct nfnl_err { 
	struct list_head	head;

	struct nlmsghdr		*nlh;

	int			err;

	struct netlink_ext_ack	extack;

};



static int nfnl_err_add(struct list_head *list, struct nlmsghdr *nlh, int err)

static int nfnl_err_add(struct list_head *list, struct nlmsghdr *nlh, int err,

			const struct netlink_ext_ack *extack)

{

	struct nfnl_err *nfnl_err;
@@ -238,6 +242,7 @@ static int nfnl_err_add(struct list_head *list, struct nlmsghdr *nlh, int err) 


	nfnl_err->nlh = nlh;

	nfnl_err->err = err;

	nfnl_err->extack = *extack;

	list_add_tail(&nfnl_err->head, list);



	return 0;
@@ -262,7 +267,8 @@ static void nfnl_err_deliver(struct list_head *err_list, struct sk_buff *skb) 
	struct nfnl_err *nfnl_err, *next;



	list_for_each_entry_safe(nfnl_err, next, err_list, head) {

		netlink_ack(skb, nfnl_err->nlh, nfnl_err->err, NULL);

		netlink_ack(skb, nfnl_err->nlh, nfnl_err->err,

			    &nfnl_err->extack);

		nfnl_err_del(nfnl_err);

	}

}
@@ -280,6 +286,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct net *net = sock_net(skb->sk);

	const struct nfnetlink_subsystem *ss;

	const struct nfnl_callback *nc;

	struct netlink_ext_ack extack;

	LIST_HEAD(err_list);

	u32 status;

	int err;
@@ -325,6 +332,7 @@ replay: 
	while (skb->len >= nlmsg_total_size(0)) {

		int msglen, type;



		memset(&extack, 0, sizeof(extack));

		nlh = nlmsg_hdr(skb);

		err = 0;
@@ -384,7 +392,8 @@ replay: 


			if (nc->call_batch) {

				err = nc->call_batch(net, net->nfnl, skb, nlh,

						     (const struct nlattr **)cda);

						     (const struct nlattr **)cda,

						     &extack);

			}



			/* The lock was released to autoload some module, we
@@ -402,7 +411,7 @@ ack: 
			 * processed, this avoids that the same error is

			 * reported several times when replaying the batch.

			 */

			if (nfnl_err_add(&err_list, nlh, err) < 0) {

			if (nfnl_err_add(&err_list, nlh, err, &extack) < 0) {

				/* We failed to enqueue an error, reset the

				 * list of errors and send OOM to userspace

				 * pointing to the batch header.

CRA Git | Maintained and supported by SUSTech CRA and CCSE