projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #536 from wigyori/cc-sec
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
630-packet_socket_type.patch
diff --git
a/target/linux/generic/patches-3.18/630-packet_socket_type.patch
b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
index
68a4236
..
32fb586
100644
(file)
--- a/
target/linux/generic/patches-3.18/630-packet_socket_type.patch
+++ b/
target/linux/generic/patches-3.18/630-packet_socket_type.patch
@@
-26,7
+26,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -15
30,6 +1530
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -15
29,6 +1529
,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@
-34,7
+34,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
/*
* When we registered the protocol we saved the socket in the data
-@@ -153
7,6 +1538
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -153
6,6 +1537
,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
*/
sk = pt->af_packet_priv;
@@
-42,7
+42,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Yank back the headers [hope the device set this
/*
* Yank back the headers [hope the device set this
-@@ -154
9,7 +1551
,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -154
8,7 +1550
,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
* so that this procedure is noop.
*/
@@
-51,7
+51,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -174
8,12 +1750
,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -174
7,12 +1749
,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len;
unsigned int snaplen, res;
int skb_len = skb->len;
unsigned int snaplen, res;
@@
-67,7
+67,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -187
3,12 +1875
,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -187
2,12 +1874
,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@@
-83,7
+83,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -28
28,6 +2830
,7 @@ static int packet_create(struct net *net
+@@ -28
31,6 +2833
,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@
-91,7
+91,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -34
09,6 +3412
,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -34
25,6 +3428
,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@@
-108,7
+108,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
default:
return -ENOPROTOOPT;
}
-@@ -34
60,6 +3473
,13 @@ static int packet_getsockopt(struct sock
+@@ -34
76,6 +3489
,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;