* [gentoo-commits] gentoo-x86 commit in net-firewall/ipt_netflow/files: ipt_netflow-2.0-pax-const.patch
@ 2014-08-19 7:21 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2014-08-19 7:21 UTC (permalink / raw
To: gentoo-commits
pinkbyte 14/08/19 07:21:25
Added: ipt_netflow-2.0-pax-const.patch
Log:
Revision bump: restore compatibility with hardened setups, wrt bug #519480, add optional debugfs support. Drop old revision
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Revision Changes Path
1.1 net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch?rev=1.1&content-type=text/plain
Index: ipt_netflow-2.0-pax-const.patch
===================================================================
Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430
Adds support for building with PaX hardened kernel
Adapted to version 2.0 by Sergey Popov <pinkbyte@gentoo.org>
--- ipt_NETFLOW.c.orig 2014-08-07 08:05:08.000000000 +0400
+++ ipt_NETFLOW.c 2014-08-18 11:10:08.000000000 +0400
@@ -845,13 +845,13 @@
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 < LOCK_COUNT)
return -EPERM;
return set_hashsize(hsize)?:ret;
@@ -864,6 +864,7 @@
{
int ret;
struct ipt_netflow_sock *usock;
+ ctl_table_no_const lctl = *ctl;
mutex_lock(&sock_lock);
if (list_empty(&usock_list)) {
@@ -875,8 +876,8 @@
sndbuf = usock->sock->sk->sk_sndbuf;
mutex_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)
@@ -943,9 +944,10 @@
{
int ret;
int val = 0;
+ ctl_table_no_const lctl = *ctl;
- 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;
@@ -966,8 +968,9 @@
int ret;
int ver = protocol;
- ctl->data = &ver;
- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
+ ctl_table_no_const lctl = *ctl;
+ lctl.data = &ver;
+ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
if (!write)
return ret;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/ipt_netflow/files: ipt_netflow-2.0-pax-const.patch
@ 2014-09-16 6:06 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2014-09-16 6:06 UTC (permalink / raw
To: gentoo-commits
jer 14/09/16 06:06:52
Modified: ipt_netflow-2.0-pax-const.patch
Log:
Version bump.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.2 net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch?r1=1.1&r2=1.2
Index: ipt_netflow-2.0-pax-const.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipt_netflow-2.0-pax-const.patch 19 Aug 2014 07:21:25 -0000 1.1
+++ ipt_netflow-2.0-pax-const.patch 16 Sep 2014 06:06:52 -0000 1.2
@@ -4,8 +4,8 @@
Adapted to version 2.0 by Sergey Popov <pinkbyte@gentoo.org>
---- ipt_NETFLOW.c.orig 2014-08-07 08:05:08.000000000 +0400
-+++ ipt_NETFLOW.c 2014-08-18 11:10:08.000000000 +0400
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
@@ -845,13 +845,13 @@
void __user *buffer, size_t *lenp, loff_t *fpos)
{
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/ipt_netflow/files: ipt_netflow-2.0-pax-const.patch
@ 2015-05-18 15:39 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2015-05-18 15:39 UTC (permalink / raw
To: gentoo-commits
pinkbyte 15/05/18 15:39:22
Removed: ipt_netflow-2.0-pax-const.patch
Log:
Drop old
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-18 15:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-18 15:39 [gentoo-commits] gentoo-x86 commit in net-firewall/ipt_netflow/files: ipt_netflow-2.0-pax-const.patch Sergey Popov (pinkbyte)
-- strict thread matches above, loose matches on Subject: below --
2014-09-16 6:06 Jeroen Roovers (jer)
2014-08-19 7:21 Sergey Popov (pinkbyte)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox