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

Commit 8f83f23e authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[XFRM]: ports in struct xfrm_selector annotated 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9d07e41

include/linux/xfrm.h

+4 −4
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ struct xfrm_selector 
{

	xfrm_address_t	daddr;

	xfrm_address_t	saddr;

	__u16	dport;

	__u16	dport_mask;

	__u16	sport;

	__u16	sport_mask;

	__be16	dport;

	__be16	dport_mask;

	__be16	sport;

	__be16	sport_mask;

	__u16	family;

	__u8	prefixlen_d;

	__u8	prefixlen_s;

net/ipv4/xfrm4_state.c

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl, 
	x->sel.daddr.a4 = fl->fl4_dst;

	x->sel.saddr.a4 = fl->fl4_src;

	x->sel.dport = xfrm_flowi_dport(fl);

	x->sel.dport_mask = ~0;

	x->sel.dport_mask = htons(0xffff);

	x->sel.sport = xfrm_flowi_sport(fl);

	x->sel.sport_mask = ~0;

	x->sel.sport_mask = htons(0xffff);

	x->sel.prefixlen_d = 32;

	x->sel.prefixlen_s = 32;

	x->sel.proto = fl->proto;

net/ipv6/xfrm6_state.c

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl, 
	ipv6_addr_copy((struct in6_addr *)&x->sel.daddr, &fl->fl6_dst);

	ipv6_addr_copy((struct in6_addr *)&x->sel.saddr, &fl->fl6_src);

	x->sel.dport = xfrm_flowi_dport(fl);

	x->sel.dport_mask = ~0;

	x->sel.dport_mask = htons(0xffff);

	x->sel.sport = xfrm_flowi_sport(fl);

	x->sel.sport_mask = ~0;

	x->sel.sport_mask = htons(0xffff);

	x->sel.prefixlen_d = 128;

	x->sel.prefixlen_s = 128;

	x->sel.proto = fl->proto;

net/key/af_key.c

+4 −4
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 
	xp->selector.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);

	xp->selector.sport = ((struct sockaddr_in *)(sa+1))->sin_port;

	if (xp->selector.sport)

		xp->selector.sport_mask = ~0;

		xp->selector.sport_mask = htons(0xffff);



	sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1], 

	pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.daddr);
@@ -2153,7 +2153,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 


	xp->selector.dport = ((struct sockaddr_in *)(sa+1))->sin_port;

	if (xp->selector.dport)

		xp->selector.dport_mask = ~0;

		xp->selector.dport_mask = htons(0xffff);



	sec_ctx = (struct sadb_x_sec_ctx *) ext_hdrs[SADB_X_EXT_SEC_CTX-1];

	if (sec_ctx != NULL) {
@@ -2243,7 +2243,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg 
	sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);

	sel.sport = ((struct sockaddr_in *)(sa+1))->sin_port;

	if (sel.sport)

		sel.sport_mask = ~0;

		sel.sport_mask = htons(0xffff);



	sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1], 

	pfkey_sadb_addr2xfrm_addr(sa, &sel.daddr);
@@ -2251,7 +2251,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg 
	sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);

	sel.dport = ((struct sockaddr_in *)(sa+1))->sin_port;

	if (sel.dport)

		sel.dport_mask = ~0;

		sel.dport_mask = htons(0xffff);



	sec_ctx = (struct sadb_x_sec_ctx *) ext_hdrs[SADB_X_EXT_SEC_CTX-1];

	memset(&tmp, 0, sizeof(struct xfrm_policy));