diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-04-28 10:59:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-28 10:59:20 +0000 |
| commit | f87df4b3615bc4e0bd9e19671f942f23782fb2ff (patch) | |
| tree | 97d1f9e32e3fc1923d68975a1bdbede09f73a2f1 /target | |
| parent | c4a32c388cbf563192e452c8417ab279db69307b (diff) | |
| download | mtk-20170518-f87df4b3615bc4e0bd9e19671f942f23782fb2ff.zip mtk-20170518-f87df4b3615bc4e0bd9e19671f942f23782fb2ff.tar.gz mtk-20170518-f87df4b3615bc4e0bd9e19671f942f23782fb2ff.tar.bz2 | |
minor cleanup for packet socket type filter
SVN-Revision: 15467
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch | 12 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch index 741966b..710b7c0 100644 --- a/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.28/240-packet_socket_type.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> /* These ones are invisible by user level */ #define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */ #define PACKET_FASTROUTE 6 /* Fastrouted frame */ -+#define PACKET_ANY 0xffffffff ++#define PACKET_MASK_ANY 0xffffffff /* mask for packet type bits */ + /* Packet socket options */ @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> unsigned int tp_hdrlen; unsigned int tp_reserve; #endif -+ int pkt_type; ++ unsigned int pkt_type; }; struct packet_skb_cb { @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; -+ po->pkt_type = PACKET_ANY & ~PACKET_LOOPBACK; ++ po->pkt_type = PACKET_MASK_ANY & ~PACKET_LOOPBACK; if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } + case PACKET_RECV_TYPE: + { -+ int val; ++ unsigned int val; + if (optlen != sizeof(val)) + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) @@ -121,8 +121,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> data = &val; break; + case PACKET_RECV_TYPE: -+ if (len > sizeof(int)) -+ len = sizeof(int); ++ if (len > sizeof(unsigned int)) ++ len = sizeof(unsigned int); + val = po->pkt_type; + + data = &val; diff --git a/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch index 741966b..710b7c0 100644 --- a/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> /* These ones are invisible by user level */ #define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */ #define PACKET_FASTROUTE 6 /* Fastrouted frame */ -+#define PACKET_ANY 0xffffffff ++#define PACKET_MASK_ANY 0xffffffff /* mask for packet type bits */ + /* Packet socket options */ @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> unsigned int tp_hdrlen; unsigned int tp_reserve; #endif -+ int pkt_type; ++ unsigned int pkt_type; }; struct packet_skb_cb { @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; -+ po->pkt_type = PACKET_ANY & ~PACKET_LOOPBACK; ++ po->pkt_type = PACKET_MASK_ANY & ~PACKET_LOOPBACK; if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } + case PACKET_RECV_TYPE: + { -+ int val; ++ unsigned int val; + if (optlen != sizeof(val)) + return -EINVAL; + if (copy_from_user(&val, optval, sizeof(val))) @@ -121,8 +121,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> data = &val; break; + case PACKET_RECV_TYPE: -+ if (len > sizeof(int)) -+ len = sizeof(int); ++ if (len > sizeof(unsigned int)) ++ len = sizeof(unsigned int); + val = po->pkt_type; + + data = &val; |