summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch')
-rw-r--r--net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
deleted file mode 100644
index b3e4b5f687a5..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430
-
-Adds support for building with PaX hardened kernel
-
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -371,14 +371,13 @@
- static int hsize_procctl(ctl_table *ctl, int write, BEFORE2632(struct file *filp,)
- void __user *buffer, size_t *lenp, loff_t *fpos)
- {
-- void *orig = ctl->data;
-+ ctl_table_no_const lctl = *ctl;
- int ret, hsize;
-
- if (write)
-- ctl->data = &hsize;
-- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+ lctl.data = &hsize;
-+ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- if (write) {
-- ctl->data = orig;
- if (hsize < 1)
- return -EPERM;
- return set_hashsize(hsize)?:ret;
-@@ -391,6 +390,7 @@
- {
- int ret;
- struct ipt_netflow_sock *usock;
-+ ctl_table_no_const lctl = *ctl;
-
- read_lock(&sock_lock);
- if (list_empty(&usock_list)) {
-@@ -401,8 +401,8 @@
- sndbuf = usock->sock->sk->sk_sndbuf;
- read_unlock(&sock_lock);
-
-- ctl->data = &sndbuf;
-- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+ lctl.data = &sndbuf;
-+ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- if (!write)
- return ret;
- if (sndbuf < SOCK_MIN_SNDBUF)
-@@ -451,10 +451,11 @@
- {
- int ret;
- int val;
-+ ctl_table_no_const lctl = *ctl;
-
- val = 0;
-- ctl->data = &val;
-- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+ lctl.data = &val;
-+ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-
- if (!write)
- return ret;