hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: support /proc conntrack flushing of specific ip addresses 

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42092 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2014-08-09 14:36:10 +00:00
parent 427b9953d2
commit 44ffcf4d4e
6 changed files with 282 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, @@ -17,6 +17,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -268,10 +269,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -373,7 +397,7 @@ static int nf_conntrack_standalone_init_ @@ -373,7 +427,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

53
target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, @@ -17,6 +17,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -268,10 +269,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -373,7 +397,7 @@ static int nf_conntrack_standalone_init_ @@ -373,7 +427,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

53
target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, @@ -17,6 +17,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -268,10 +269,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -373,7 +397,7 @@ static int nf_conntrack_standalone_init_ @@ -373,7 +427,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

53
target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, @@ -16,6 +16,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -267,10 +268,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_ @@ -372,7 +426,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

53
target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, @@ -16,6 +16,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -267,10 +268,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_ @@ -372,7 +426,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;

53
target/linux/generic/patches-3.9/604-netfilter_conntrack_flush.patch
View File

@ -1,12 +1,35 @@
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, @@ -16,6 +16,7 @@
#include <linux/percpu.h>
#include <linux/netdevice.h>
#include <linux/security.h>
+#include <linux/inet.h>
#include <net/net_namespace.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
@@ -267,10 +268,63 @@ static int ct_open(struct inode *inode,
sizeof(struct ct_iter_state)); sizeof(struct ct_iter_state));
} }
+static int kill_all(struct nf_conn *i, void *data) +struct kill_request {
+ u16 family;
+ union nf_inet_addr addr;
+};
+
+static int kill_matching(struct nf_conn *i, void *data)
+{ +{
+ struct kill_request *kr = data;
+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+
+ if (!kr->family)
+ return 1; + return 1;
+
+ if (t->src.l3num != kr->family)
+ return 0;
+
+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) ||
+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3));
+} +}
+ +
+static ssize_t ct_file_write(struct file *file, const char __user *buf, +static ssize_t ct_file_write(struct file *file, const char __user *buf,
@ -14,16 +37,30 @@
+{ +{
+ struct seq_file *seq = file->private_data; + struct seq_file *seq = file->private_data;
+ struct net *net = seq_file_net(seq); + struct net *net = seq_file_net(seq);
+ struct kill_request kr = { };
+ char req[INET6_ADDRSTRLEN] = { };
+ +
+ if (count) { + if (count == 0)
+ char c; + return 0;
+ +
+ if (get_user(c, buf)) + if (count >= INET6_ADDRSTRLEN)
+ count = INET6_ADDRSTRLEN - 1;
+
+ if (copy_from_user(req, buf, count))
+ return -EFAULT; + return -EFAULT;
+ +
+ if (c == 'f') + if (strnchr(req, count, ':')) {
+ nf_ct_iterate_cleanup(net, kill_all, NULL); + kr.family = AF_INET6;
+ if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } else if (strnchr(req, count, '.')) {
+ kr.family = AF_INET;
+ if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
+ return -EINVAL;
+ } + }
+
+ nf_ct_iterate_cleanup(net, kill_matching, &kr);
+
+ return count; + return count;
+} +}
+ +
@ -35,7 +72,7 @@
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net, .release = seq_release_net,
}; };
@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_ @@ -372,7 +426,7 @@ static int nf_conntrack_standalone_init_
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;