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

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

[NET]: Fix "ntohl(ntohs" bugs 



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

net/ipv4/ipcomp.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) 
	    skb->h.icmph->code != ICMP_FRAG_NEEDED)

		return;



	spi = ntohl(ntohs(ipch->cpi));

	spi = htonl(ntohs(ipch->cpi));

	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr,

	                      spi, IPPROTO_COMP, AF_INET);

	if (!x)

net/ipv4/xfrm4_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) 
			if (pskb_may_pull(skb, xprth + 4 - skb->data)) {

				u16 *ipcomp_hdr = (u16 *)xprth;



				fl->fl_ipsec_spi = ntohl(ntohs(ipcomp_hdr[1]));

				fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1]));

			}

			break;

		default:

net/ipv6/ipcomp6.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	if (type != ICMPV6_DEST_UNREACH && type != ICMPV6_PKT_TOOBIG)

		return;



	spi = ntohl(ntohs(ipcomph->cpi));

	spi = htonl(ntohs(ipcomph->cpi));

	x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6);

	if (!x)

		return;

net/xfrm/xfrm_input.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq) 
	case IPPROTO_COMP:

		if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))

			return -EINVAL;

		*spi = ntohl(ntohs(*(u16*)(skb->h.raw + 2)));

		*spi = htonl(ntohs(*(u16*)(skb->h.raw + 2)));

		*seq = 0;

		return 0;

	default: