18 files changed, 150 insertions, 99 deletions

diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index e49bb6d948a1..e9aced0ec56b 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -260,7 +260,7 @@ static int pppoatm_devppp_ioctl(struct ppp_channel *chan, unsigned int cmd,
         return -ENOTTY;
 }
 
-static /*const*/ struct ppp_channel_ops pppoatm_ops = {
+static const struct ppp_channel_ops pppoatm_ops = {
         .start_xmit = pppoatm_send,
         .ioctl = pppoatm_devppp_ioctl,
 };
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8303f1c9ef54..c52f091ee6de 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -924,7 +924,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
         hci_conn_hash_init(hdev);
 
-        INIT_LIST_HEAD(&hdev->blacklist.list);
+        INIT_LIST_HEAD(&hdev->blacklist);
 
         memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
 
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 4f170a595934..83acd164d39e 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -168,9 +168,8 @@ static int hci_sock_release(struct socket *sock)
 struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
         struct list_head *p;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
 
-        list_for_each(p, &blacklist->list) {
+        list_for_each(p, &hdev->blacklist) {
                 struct bdaddr_list *b;
 
                 b = list_entry(p, struct bdaddr_list, list);
@@ -202,7 +201,7 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg)
 
         bacpy(&entry->bdaddr, &bdaddr);
 
-        list_add(&entry->list, &hdev->blacklist.list);
+        list_add(&entry->list, &hdev->blacklist);
 
         return 0;
 }
@@ -210,9 +209,8 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg)
 int hci_blacklist_clear(struct hci_dev *hdev)
 {
         struct list_head *p, *n;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
 
-        list_for_each_safe(p, n, &blacklist->list) {
+        list_for_each_safe(p, n, &hdev->blacklist) {
                 struct bdaddr_list *b;
 
                 b = list_entry(p, struct bdaddr_list, list);
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index ce44c47eeac1..8fb967beee80 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -439,12 +439,11 @@ static const struct file_operations inquiry_cache_fops = {
 static int blacklist_show(struct seq_file *f, void *p)
 {
         struct hci_dev *hdev = f->private;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
         struct list_head *l;
 
         hci_dev_lock_bh(hdev);
 
-        list_for_each(l, &blacklist->list) {
+        list_for_each(l, &hdev->blacklist) {
                 struct bdaddr_list *b;
                 bdaddr_t bdaddr;
 
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 9ba1e8eee37c..3e3cd9d4e52c 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2527,6 +2527,10 @@ done:
                 if (pi->imtu != L2CAP_DEFAULT_MTU)
                         l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->imtu);
 
+                if (!(pi->conn->feat_mask & L2CAP_FEAT_ERTM) &&
+                                !(pi->conn->feat_mask & L2CAP_FEAT_STREAMING))
+                        break;
+
                 rfc.mode            = L2CAP_MODE_BASIC;
                 rfc.txwin_size      = 0;
                 rfc.max_transmit    = 0;
@@ -2534,6 +2538,8 @@ done:
                 rfc.monitor_timeout = 0;
                 rfc.max_pdu_size    = 0;
 
+                l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+                                                        (unsigned long) &rfc);
                 break;
 
         case L2CAP_MODE_ERTM:
@@ -2546,6 +2552,9 @@ done:
                 if (L2CAP_DEFAULT_MAX_PDU_SIZE > pi->conn->mtu - 10)
                         rfc.max_pdu_size = cpu_to_le16(pi->conn->mtu - 10);
 
+                l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+                                                        (unsigned long) &rfc);
+
                 if (!(pi->conn->feat_mask & L2CAP_FEAT_FCS))
                         break;
 
@@ -2566,6 +2575,9 @@ done:
                 if (L2CAP_DEFAULT_MAX_PDU_SIZE > pi->conn->mtu - 10)
                         rfc.max_pdu_size = cpu_to_le16(pi->conn->mtu - 10);
 
+                l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
+                                                        (unsigned long) &rfc);
+
                 if (!(pi->conn->feat_mask & L2CAP_FEAT_FCS))
                         break;
 
@@ -2577,9 +2589,6 @@ done:
                 break;
         }
 
-        l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
-                                                (unsigned long) &rfc);
-
         /* FIXME: Need actual value of the flush timeout */
         //if (flush_to != L2CAP_DEFAULT_FLUSH_TO)
         //   l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO, 2, pi->flush_to);
@@ -3339,6 +3348,15 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
 
         del_timer(&conn->info_timer);
 
+        if (result != L2CAP_IR_SUCCESS) {
+                conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_DONE;
+                conn->info_ident = 0;
+
+                l2cap_conn_start(conn);
+
+                return 0;
+        }
+
         if (type == L2CAP_IT_FEAT_MASK) {
                 conn->feat_mask = get_unaligned_le32(rsp->data);
 
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 026205c18b78..befc3a52aa04 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -1183,7 +1183,7 @@ int __init rfcomm_init_ttys(void)
         return 0;
 }
 
-void __exit rfcomm_cleanup_ttys(void)
+void rfcomm_cleanup_ttys(void)
 {
         tty_unregister_driver(rfcomm_tty_driver);
         put_tty_driver(rfcomm_tty_driver);
diff --git a/net/core/dev.c b/net/core/dev.c
index e1c1cdcc2bb0..1ae654391442 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2517,6 +2517,7 @@ int netif_rx(struct sk_buff *skb)
                 struct rps_dev_flow voidflow, *rflow = &voidflow;
                 int cpu;
 
+                preempt_disable();
                 rcu_read_lock();
 
                 cpu = get_rps_cpu(skb->dev, skb, &rflow);
@@ -2526,6 +2527,7 @@ int netif_rx(struct sk_buff *skb)
                 ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
 
                 rcu_read_unlock();
+                preempt_enable();
         }
 #else
         {
@@ -3072,7 +3074,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
         int mac_len;
         enum gro_result ret;
 
-        if (!(skb->dev->features & NETIF_F_GRO))
+        if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb))
                 goto normal;
 
         if (skb_is_gso(skb) || skb_has_frags(skb))
@@ -3159,9 +3161,6 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 {
         struct sk_buff *p;
 
-        if (netpoll_rx_on(skb))
-                return GRO_NORMAL;
-
         for (p = napi->gro_list; p; p = p->next) {
                 NAPI_GRO_CB(p)->same_flow =
                         (p->dev == skb->dev) &&
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 3c426cb318e7..e663b78a2ef6 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3930,7 +3930,7 @@ u8 *tcp_parse_md5sig_option(struct tcphdr *th)
                         if (opsize < 2 || opsize > length)
                                 return NULL;
                         if (opcode == TCPOPT_MD5SIG)
-                                return ptr;
+                                return opsize == TCPOLEN_MD5SIG ? ptr : NULL;
                 }
                 ptr += opsize - 2;
                 length -= opsize;
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 800bc53b7f63..dfe7b38dd4af 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -20,7 +20,7 @@
 /* Please put other headers in irnet.h - Thanks */
 
 /* Generic PPP callbacks (to call us) */
-static struct ppp_channel_ops irnet_ppp_ops = {
+static const struct ppp_channel_ops irnet_ppp_ops = {
         .start_xmit = ppp_irnet_send,
         .ioctl = ppp_irnet_ioctl
 };
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 90d82b3f2889..ff954b3e94b6 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -135,7 +135,10 @@ struct pppol2tp_session {
 
 static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 
-static struct ppp_channel_ops pppol2tp_chan_ops = { pppol2tp_xmit , NULL };
+static const struct ppp_channel_ops pppol2tp_chan_ops = {
+        .start_xmit =  pppol2tp_xmit,
+};
+
 static const struct proto_ops pppol2tp_ops;
 
 /* Helpers to obtain tunnel/session contexts from sockets.
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 7cc4f913a431..798a91b100cc 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -685,10 +685,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
         return 0;
 
+#ifdef CONFIG_INET
  fail_ifa:
         pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
                                &local->network_latency_notifier);
         rtnl_lock();
+#endif
  fail_pm_qos:
         ieee80211_led_exit(local);
         ieee80211_remove_interfaces(local);
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 41f20fb7e670..872d7b6ef6b3 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -400,19 +400,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
         else
                 __set_bit(SCAN_SW_SCANNING, &local->scanning);
 
-        /*
-         * Kicking off the scan need not be protected,
-         * only the scan variable stuff, since now
-         * local->scan_req is assigned and other callers
-         * will abort their scan attempts.
-         *
-         * This avoids too many locking dependencies
-         * so that the scan completed calls have more
-         * locking freedom.
-         */
-
         ieee80211_recalc_idle(local);
-        mutex_unlock(&local->scan_mtx);
 
         if (local->ops->hw_scan) {
                 WARN_ON(!ieee80211_prep_hw_scan(local));
@@ -420,8 +408,6 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
         } else
                 rc = ieee80211_start_sw_scan(local);
 
-        mutex_lock(&local->scan_mtx);
-
         if (rc) {
                 kfree(local->hw_scan_req);
                 local->hw_scan_req = NULL;
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index 2714da167fb8..b6ffe4e1b84a 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -245,6 +245,9 @@ static void rxrpc_resend_timer(struct rxrpc_call *call)
         _enter("%d,%d,%d",
                call->acks_tail, call->acks_unacked, call->acks_head);
 
+        if (call->state >= RXRPC_CALL_COMPLETE)
+                return;
+
         resend = 0;
         resend_at = 0;
 
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
index 909d092de9f4..bf656c230ba9 100644
--- a/net/rxrpc/ar-call.c
+++ b/net/rxrpc/ar-call.c
@@ -786,6 +786,7 @@ static void rxrpc_call_life_expired(unsigned long _call)
 
 /*
  * handle resend timer expiry
+ * - may not take call->state_lock as this can deadlock against del_timer_sync()
  */
 static void rxrpc_resend_time_expired(unsigned long _call)
 {
@@ -796,12 +797,9 @@ static void rxrpc_resend_time_expired(unsigned long _call)
         if (call->state >= RXRPC_CALL_COMPLETE)
                 return;
 
-        read_lock_bh(&call->state_lock);
         clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-        if (call->state < RXRPC_CALL_COMPLETE &&
-            !test_and_set_bit(RXRPC_CALL_RESEND_TIMER, &call->events))
+        if (!test_and_set_bit(RXRPC_CALL_RESEND_TIMER, &call->events))
                 rxrpc_queue_call(call);
-        read_unlock_bh(&call->state_lock);
 }
 
 /*
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index d0386a413e8d..509a2d53a99d 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -114,6 +114,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
         int egress;
         int action;
         int ihl;
+        int noff;
 
         spin_lock(&p->tcf_lock);
 
@@ -132,7 +133,8 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
         if (unlikely(action == TC_ACT_SHOT))
                 goto drop;
 
-        if (!pskb_may_pull(skb, sizeof(*iph)))
+        noff = skb_network_offset(skb);
+        if (!pskb_may_pull(skb, sizeof(*iph) + noff))
                 goto drop;
 
         iph = ip_hdr(skb);
@@ -144,7 +146,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
 
         if (!((old_addr ^ addr) & mask)) {
                 if (skb_cloned(skb) &&
-                    !skb_clone_writable(skb, sizeof(*iph)) &&
+                    !skb_clone_writable(skb, sizeof(*iph) + noff) &&
                     pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                         goto drop;
 
@@ -172,9 +174,9 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
         {
                 struct tcphdr *tcph;
 
-                if (!pskb_may_pull(skb, ihl + sizeof(*tcph)) ||
+                if (!pskb_may_pull(skb, ihl + sizeof(*tcph) + noff) ||
                     (skb_cloned(skb) &&
-                     !skb_clone_writable(skb, ihl + sizeof(*tcph)) &&
+                     !skb_clone_writable(skb, ihl + sizeof(*tcph) + noff) &&
                      pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
                         goto drop;
 
@@ -186,9 +188,9 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
         {
                 struct udphdr *udph;
 
-                if (!pskb_may_pull(skb, ihl + sizeof(*udph)) ||
+                if (!pskb_may_pull(skb, ihl + sizeof(*udph) + noff) ||
                     (skb_cloned(skb) &&
-                     !skb_clone_writable(skb, ihl + sizeof(*udph)) &&
+                     !skb_clone_writable(skb, ihl + sizeof(*udph) + noff) &&
                      pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
                         goto drop;
 
@@ -205,7 +207,7 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
         {
                 struct icmphdr *icmph;
 
-                if (!pskb_may_pull(skb, ihl + sizeof(*icmph)))
+                if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + noff))
                         goto drop;
 
                 icmph = (void *)(skb_network_header(skb) + ihl);
@@ -215,7 +217,8 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                     (icmph->type != ICMP_PARAMETERPROB))
                         break;
 
-                if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph)))
+                if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph) +
+                                        noff))
                         goto drop;
 
                 icmph = (void *)(skb_network_header(skb) + ihl);
@@ -229,8 +232,8 @@ static int tcf_nat(struct sk_buff *skb, struct tc_action *a,
                         break;
 
                 if (skb_cloned(skb) &&
-                    !skb_clone_writable(skb,
-                                        ihl + sizeof(*icmph) + sizeof(*iph)) &&
+                    !skb_clone_writable(skb, ihl + sizeof(*icmph) +
+                                             sizeof(*iph) + noff) &&
                     pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                         goto drop;
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index f73542d2cdd0..e17096e3913c 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -65,37 +65,47 @@ static inline u32 addr_fold(void *addr)
         return (a & 0xFFFFFFFF) ^ (BITS_PER_LONG > 32 ? a >> 32 : 0);
 }
 
-static u32 flow_get_src(const struct sk_buff *skb)
+static u32 flow_get_src(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case htons(ETH_P_IP):
-                return ntohl(ip_hdr(skb)->saddr);
+                if (pskb_network_may_pull(skb, sizeof(struct iphdr)))
+                        return ntohl(ip_hdr(skb)->saddr);
+                break;
         case htons(ETH_P_IPV6):
-                return ntohl(ipv6_hdr(skb)->saddr.s6_addr32[3]);
-        default:
-                return addr_fold(skb->sk);
+                if (pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
+                        return ntohl(ipv6_hdr(skb)->saddr.s6_addr32[3]);
+                break;
         }
+
+        return addr_fold(skb->sk);
 }
 
-static u32 flow_get_dst(const struct sk_buff *skb)
+static u32 flow_get_dst(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case htons(ETH_P_IP):
-                return ntohl(ip_hdr(skb)->daddr);
+                if (pskb_network_may_pull(skb, sizeof(struct iphdr)))
+                        return ntohl(ip_hdr(skb)->daddr);
+                break;
         case htons(ETH_P_IPV6):
-                return ntohl(ipv6_hdr(skb)->daddr.s6_addr32[3]);
-        default:
-                return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
+                if (pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
+                        return ntohl(ipv6_hdr(skb)->daddr.s6_addr32[3]);
+                break;
         }
+
+        return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
 }
 
-static u32 flow_get_proto(const struct sk_buff *skb)
+static u32 flow_get_proto(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case htons(ETH_P_IP):
-                return ip_hdr(skb)->protocol;
+                return pskb_network_may_pull(skb, sizeof(struct iphdr)) ?
+                       ip_hdr(skb)->protocol : 0;
         case htons(ETH_P_IPV6):
-                return ipv6_hdr(skb)->nexthdr;
+                return pskb_network_may_pull(skb, sizeof(struct ipv6hdr)) ?
+                       ipv6_hdr(skb)->nexthdr : 0;
         default:
                 return 0;
         }
@@ -116,58 +126,64 @@ static int has_ports(u8 protocol)
         }
 }
 
-static u32 flow_get_proto_src(const struct sk_buff *skb)
+static u32 flow_get_proto_src(struct sk_buff *skb)
 {
-        u32 res = 0;
-
         switch (skb->protocol) {
         case htons(ETH_P_IP): {
-                struct iphdr *iph = ip_hdr(skb);
+                struct iphdr *iph;
 
+                if (!pskb_network_may_pull(skb, sizeof(*iph)))
+                        break;
+                iph = ip_hdr(skb);
                 if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-                    has_ports(iph->protocol))
-                        res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4));
+                    has_ports(iph->protocol) &&
+                    pskb_network_may_pull(skb, iph->ihl * 4 + 2))
+                        return ntohs(*(__be16 *)((void *)iph + iph->ihl * 4));
                 break;
         }
         case htons(ETH_P_IPV6): {
-                struct ipv6hdr *iph = ipv6_hdr(skb);
+                struct ipv6hdr *iph;
 
+                if (!pskb_network_may_pull(skb, sizeof(*iph) + 2))
+                        break;
+                iph = ipv6_hdr(skb);
                 if (has_ports(iph->nexthdr))
-                        res = ntohs(*(__be16 *)&iph[1]);
+                        return ntohs(*(__be16 *)&iph[1]);
                 break;
         }
-        default:
-                res = addr_fold(skb->sk);
         }
 
-        return res;
+        return addr_fold(skb->sk);
 }
 
-static u32 flow_get_proto_dst(const struct sk_buff *skb)
+static u32 flow_get_proto_dst(struct sk_buff *skb)
 {
-        u32 res = 0;
-
         switch (skb->protocol) {
         case htons(ETH_P_IP): {
-                struct iphdr *iph = ip_hdr(skb);
+                struct iphdr *iph;
 
+                if (!pskb_network_may_pull(skb, sizeof(*iph)))
+                        break;
+                iph = ip_hdr(skb);
                 if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-                    has_ports(iph->protocol))
-                        res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4 + 2));
+                    has_ports(iph->protocol) &&
+                    pskb_network_may_pull(skb, iph->ihl * 4 + 4))
+                        return ntohs(*(__be16 *)((void *)iph + iph->ihl * 4 + 2));
                 break;
         }
         case htons(ETH_P_IPV6): {
-                struct ipv6hdr *iph = ipv6_hdr(skb);
+                struct ipv6hdr *iph;
 
+                if (!pskb_network_may_pull(skb, sizeof(*iph) + 4))
+                        break;
+                iph = ipv6_hdr(skb);
                 if (has_ports(iph->nexthdr))
-                        res = ntohs(*(__be16 *)((void *)&iph[1] + 2));
+                        return ntohs(*(__be16 *)((void *)&iph[1] + 2));
                 break;
         }
-        default:
-                res = addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
         }
 
-        return res;
+        return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;
 }
 
 static u32 flow_get_iif(const struct sk_buff *skb)
@@ -211,7 +227,7 @@ static u32 flow_get_nfct(const struct sk_buff *skb)
 })
 #endif
 
-static u32 flow_get_nfct_src(const struct sk_buff *skb)
+static u32 flow_get_nfct_src(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case htons(ETH_P_IP):
@@ -223,7 +239,7 @@ fallback:
         return flow_get_src(skb);
 }
 
-static u32 flow_get_nfct_dst(const struct sk_buff *skb)
+static u32 flow_get_nfct_dst(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case htons(ETH_P_IP):
@@ -235,14 +251,14 @@ fallback:
         return flow_get_dst(skb);
 }
 
-static u32 flow_get_nfct_proto_src(const struct sk_buff *skb)
+static u32 flow_get_nfct_proto_src(struct sk_buff *skb)
 {
         return ntohs(CTTUPLE(skb, src.u.all));
 fallback:
         return flow_get_proto_src(skb);
 }
 
-static u32 flow_get_nfct_proto_dst(const struct sk_buff *skb)
+static u32 flow_get_nfct_proto_dst(struct sk_buff *skb)
 {
         return ntohs(CTTUPLE(skb, dst.u.all));
 fallback:
@@ -281,7 +297,7 @@ static u32 flow_get_vlan_tag(const struct sk_buff *skb)
         return tag & VLAN_VID_MASK;
 }
 
-static u32 flow_key_get(const struct sk_buff *skb, int key)
+static u32 flow_key_get(struct sk_buff *skb, int key)
 {
         switch (key) {
         case FLOW_KEY_SRC:
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index dd9414e44200..425a1790b048 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -143,9 +143,17 @@ static int rsvp_classify(struct sk_buff *skb, struct tcf_proto *tp,
         u8 tunnelid = 0;
         u8 *xprt;
 #if RSVP_DST_LEN == 4
-        struct ipv6hdr *nhptr = ipv6_hdr(skb);
+        struct ipv6hdr *nhptr;
+
+        if (!pskb_network_may_pull(skb, sizeof(*nhptr)))
+                return -1;
+        nhptr = ipv6_hdr(skb);
 #else
-        struct iphdr *nhptr = ip_hdr(skb);
+        struct iphdr *nhptr;
+
+        if (!pskb_network_may_pull(skb, sizeof(*nhptr)))
+                return -1;
+        nhptr = ip_hdr(skb);
 #endif
 
 restart:
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index c65762823f5e..534f33231c17 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -122,7 +122,11 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
         switch (skb->protocol) {
         case htons(ETH_P_IP):
         {
-                const struct iphdr *iph = ip_hdr(skb);
+                const struct iphdr *iph;
+
+                if (!pskb_network_may_pull(skb, sizeof(*iph)))
+                        goto err;
+                iph = ip_hdr(skb);
                 h = (__force u32)iph->daddr;
                 h2 = (__force u32)iph->saddr ^ iph->protocol;
                 if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
@@ -131,25 +135,32 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
                      iph->protocol == IPPROTO_UDPLITE ||
                      iph->protocol == IPPROTO_SCTP ||
                      iph->protocol == IPPROTO_DCCP ||
-                     iph->protocol == IPPROTO_ESP))
+                     iph->protocol == IPPROTO_ESP) &&
+                     pskb_network_may_pull(skb, iph->ihl * 4 + 4))
                         h2 ^= *(((u32*)iph) + iph->ihl);
                 break;
         }
         case htons(ETH_P_IPV6):
         {
-                struct ipv6hdr *iph = ipv6_hdr(skb);
+                struct ipv6hdr *iph;
+
+                if (!pskb_network_may_pull(skb, sizeof(*iph)))
+                        goto err;
+                iph = ipv6_hdr(skb);
                 h = (__force u32)iph->daddr.s6_addr32[3];
                 h2 = (__force u32)iph->saddr.s6_addr32[3] ^ iph->nexthdr;
-                if (iph->nexthdr == IPPROTO_TCP ||
-                    iph->nexthdr == IPPROTO_UDP ||
-                    iph->nexthdr == IPPROTO_UDPLITE ||
-                    iph->nexthdr == IPPROTO_SCTP ||
-                    iph->nexthdr == IPPROTO_DCCP ||
-                    iph->nexthdr == IPPROTO_ESP)
+                if ((iph->nexthdr == IPPROTO_TCP ||
+                     iph->nexthdr == IPPROTO_UDP ||
+                     iph->nexthdr == IPPROTO_UDPLITE ||
+                     iph->nexthdr == IPPROTO_SCTP ||
+                     iph->nexthdr == IPPROTO_DCCP ||
+                     iph->nexthdr == IPPROTO_ESP) &&
+                    pskb_network_may_pull(skb, sizeof(*iph) + 4))
                         h2 ^= *(u32*)&iph[1];
                 break;
         }
         default:
+err:
                 h = (unsigned long)skb_dst(skb) ^ (__force u32)skb->protocol;
                 h2 = (unsigned long)skb->sk;
         }
@@ -502,6 +513,12 @@ static unsigned long sfq_get(struct Qdisc *sch, u32 classid)
         return 0;
 }
 
+static unsigned long sfq_bind(struct Qdisc *sch, unsigned long parent,
+                              u32 classid)
+{
+        return 0;
+}
+
 static struct tcf_proto **sfq_find_tcf(struct Qdisc *sch, unsigned long cl)
 {
         struct sfq_sched_data *q = qdisc_priv(sch);
@@ -556,6 +573,7 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
 static const struct Qdisc_class_ops sfq_class_ops = {
         .get            =       sfq_get,
         .tcf_chain      =       sfq_find_tcf,
+        .bind_tcf       =       sfq_bind,
         .dump           =       sfq_dump_class,
         .dump_stats     =       sfq_dump_class_stats,
         .walk           =       sfq_walk,