mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
[NET]: Fix "ntohl(ntohs" bugs
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ae181bc44c
commit
4195f81453
@ -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)
|
||||
|
@ -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:
|
||||
|
@ -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;
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user