Changeset 44885


Ignore:
Timestamp:
2015-03-19T12:58:30+01:00 (3 years ago)
Author:
nbd
Message:

ar71xx: fix a double dereference in the unaligned access patch

Signed-off-by: Felix Fietkau <nbd@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch

    r44649 r44885  
    211211 #include <linux/ipv6.h> 
    212212 #include <linux/icmpv6.h> 
    213 @@ -833,10 +834,10 @@ static void tcp_v6_send_response(struct 
     213@@ -833,10 +834,10 @@ static void tcp_v6_send_response(struct  
    214214        topt = (__be32 *)(t1 + 1); 
    215215  
     
    638638--- a/include/net/inet_ecn.h 
    639639+++ b/include/net/inet_ecn.h 
    640 @@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct 
     640@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct  
    641641 { 
    642642        if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph))) 
     
    823823--- a/net/xfrm/xfrm_input.c 
    824824+++ b/net/xfrm/xfrm_input.c 
    825 @@ -152,8 +152,8 @@ int xfrm_parse_spi(struct sk_buff *skb, 
     825@@ -152,8 +152,8 @@ int xfrm_parse_spi(struct sk_buff *skb,  
    826826        if (!pskb_may_pull(skb, hlen)) 
    827827                return -EINVAL; 
     
    870870--- a/net/ipv6/netfilter/nf_log_ipv6.c 
    871871+++ b/net/ipv6/netfilter/nf_log_ipv6.c 
    872 @@ -63,9 +63,10 @@ static void dump_ipv6_packet(struct nf_l 
     872@@ -63,9 +63,9 @@ static void dump_ipv6_packet(struct nf_l 
    873873        /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */ 
    874874        nf_log_buf_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ", 
    875875               ntohs(ih->payload_len) + sizeof(struct ipv6hdr), 
     876-              (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20, 
    876877+              (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20, 
    877                (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20, 
    878878               ih->hop_limit, 
    879879-              (ntohl(*(__be32 *)ih) & 0x000fffff)); 
Note: See TracChangeset for help on using the changeset viewer.