提交 4195f814 编写于 作者: A Alexey Dobriyan 提交者: David S. Miller

[NET]: Fix "ntohl(ntohs" bugs

Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ae181bc4
...@@ -210,7 +210,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) ...@@ -210,7 +210,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
skb->h.icmph->code != ICMP_FRAG_NEEDED) skb->h.icmph->code != ICMP_FRAG_NEEDED)
return; return;
spi = ntohl(ntohs(ipch->cpi)); spi = htonl(ntohs(ipch->cpi));
x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr,
spi, IPPROTO_COMP, AF_INET); spi, IPPROTO_COMP, AF_INET);
if (!x) if (!x)
......
...@@ -221,7 +221,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) ...@@ -221,7 +221,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
if (pskb_may_pull(skb, xprth + 4 - skb->data)) { if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
u16 *ipcomp_hdr = (u16 *)xprth; u16 *ipcomp_hdr = (u16 *)xprth;
fl->fl_ipsec_spi = ntohl(ntohs(ipcomp_hdr[1])); fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1]));
} }
break; break;
default: default:
......
...@@ -208,7 +208,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ...@@ -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) if (type != ICMPV6_DEST_UNREACH && type != ICMPV6_PKT_TOOBIG)
return; 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); x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6);
if (!x) if (!x)
return; return;
......
...@@ -62,7 +62,7 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq) ...@@ -62,7 +62,7 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq)
case IPPROTO_COMP: case IPPROTO_COMP:
if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr))) if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))
return -EINVAL; return -EINVAL;
*spi = ntohl(ntohs(*(u16*)(skb->h.raw + 2))); *spi = htonl(ntohs(*(u16*)(skb->h.raw + 2)));
*seq = 0; *seq = 0;
return 0; return 0;
default: default:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册