diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-13 09:34:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-13 09:34:03 +0000 |
| commit | a045629b04d5f328044ac2b0dddb7e11e6585336 (patch) | |
| tree | 00184f86c34019e00388d56a740cbc09b805b754 /target | |
| parent | 90ee91f93d55bc225d127d25107e8541fb482ee2 (diff) | |
| download | master-187ad058-a045629b04d5f328044ac2b0dddb7e11e6585336.tar.gz master-187ad058-a045629b04d5f328044ac2b0dddb7e11e6585336.tar.bz2 master-187ad058-a045629b04d5f328044ac2b0dddb7e11e6585336.zip | |
kernel: fix pkt_type filter mask for packet sockets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41178 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
8 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.10/630-packet_socket_type.patch b/target/linux/generic/patches-3.10/630-packet_socket_type.patch index 14878d3820..3a3c3bb84f 100644 --- a/target/linux/generic/patches-3.10/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.10/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.12/630-packet_socket_type.patch b/target/linux/generic/patches-3.12/630-packet_socket_type.patch index 1e915f61fb..60e840153b 100644 --- a/target/linux/generic/patches-3.12/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.12/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.13/630-packet_socket_type.patch b/target/linux/generic/patches-3.13/630-packet_socket_type.patch index 1e915f61fb..60e840153b 100644 --- a/target/linux/generic/patches-3.13/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.13/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.14/630-packet_socket_type.patch b/target/linux/generic/patches-3.14/630-packet_socket_type.patch index d0247af83f..4f3f5e8b7f 100644 --- a/target/linux/generic/patches-3.14/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.14/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.3/630-packet_socket_type.patch b/target/linux/generic/patches-3.3/630-packet_socket_type.patch index 231b745c6a..bcb399141f 100644 --- a/target/linux/generic/patches-3.3/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.3/630-packet_socket_type.patch @@ -110,7 +110,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.6/630-packet_socket_type.patch b/target/linux/generic/patches-3.6/630-packet_socket_type.patch index a630d1d823..b43c14594f 100644 --- a/target/linux/generic/patches-3.6/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.6/630-packet_socket_type.patch @@ -110,7 +110,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/target/linux/generic/patches-3.8/630-packet_socket_type.patch index 0671a28e9b..d1a9ee23a8 100644 --- a/target/linux/generic/patches-3.8/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.8/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: diff --git a/target/linux/generic/patches-3.9/630-packet_socket_type.patch b/target/linux/generic/patches-3.9/630-packet_socket_type.patch index 9b700f5150..ff57bb76c2 100644 --- a/target/linux/generic/patches-3.9/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.9/630-packet_socket_type.patch @@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) + return -EFAULT; -+ po->pkt_type = val & ~PACKET_LOOPBACK; ++ po->pkt_type = val & ~BIT(PACKET_LOOPBACK); + return 0; + } default: |