Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db983c11 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: KM reporting in netns 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7067802e

include/net/xfrm.h

+2 −2
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ struct xfrm_mgr 
	struct xfrm_policy	*(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);

	int			(*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);

	int			(*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);

	int			(*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);

	int			(*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);

	int			(*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k);

};
@@ -1471,7 +1471,7 @@ extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type, 


extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);

extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);

extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);

extern int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);



extern void xfrm_input_init(void);

extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);

net/ipv6/mip6.c

+2 −1
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static inline int mip6_report_rl_allow(struct timeval *stamp, 


static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct flowi *fl)

{

	struct net *net = xs_net(x);

	struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;

	struct ipv6_destopt_hao *hao = NULL;

	struct xfrm_selector sel;
@@ -247,7 +248,7 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct 
		sel.sport_mask = htons(~0);

	sel.ifindex = fl->oif;



	err = km_report(IPPROTO_DSTOPTS, &sel,

	err = km_report(net, IPPROTO_DSTOPTS, &sel,

			(hao ? (xfrm_address_t *)&hao->addr : NULL));



 out:

net/xfrm/xfrm_state.c

+2 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type, 
EXPORT_SYMBOL(km_migrate);

#endif



int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr)

int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr)

{

	int err = -EINVAL;

	int ret;
@@ -1842,7 +1842,7 @@ int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr) 
	read_lock(&xfrm_km_lock);

	list_for_each_entry(km, &xfrm_km_list, list) {

		if (km->report) {

			ret = km->report(proto, sel, addr);

			ret = km->report(net, proto, sel, addr);

			if (!ret)

				err = ret;

		}

net/xfrm/xfrm_user.c

+2 −3
Original line number Diff line number Diff line
@@ -2520,10 +2520,9 @@ nla_put_failure: 
	return -EMSGSIZE;

}



static int xfrm_send_report(u8 proto, struct xfrm_selector *sel,

			    xfrm_address_t *addr)

static int xfrm_send_report(struct net *net, u8 proto,

			    struct xfrm_selector *sel, xfrm_address_t *addr)

{

	struct net *net = &init_net;

	struct sk_buff *skb;



	skb = nlmsg_new(xfrm_report_msgsize(), GFP_ATOMIC);