summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Mark Huang [Thu, 27 Jan 2005 20:51:05 +0000 (20:51 +0000)]
- merge revision 1.7
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +33 -6
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:50:52 +0000 (20:50 +0000)]
- merge revision 1.1
date: 2005/01/10 18:29:17; author: mlhuang; state: Exp;
patch-o-matic-ng-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:50:28 +0000 (20:50 +0000)]
- merge revision 1.3
date: 2005/01/10 18:58:16; author: mlhuang; state: Exp; lines: +3 -3
patch-o-matic-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:50:20 +0000 (20:50 +0000)]
- merge revision 1.6
date: 2005/01/10 18:38:07; author: mlhuang; state: Exp; lines: +16 -1
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:50:10 +0000 (20:50 +0000)]
- merge revision 1.2
date: 2005/01/10 18:37:28; author: mlhuang; state: Exp; lines: +4 -3
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:49:38 +0000 (20:49 +0000)]
- merge revision 1.3
date: 2005/01/10 18:37:28; author: mlhuang; state: Exp; lines: +1 -1
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:49:25 +0000 (20:49 +0000)]
- merge revision 1.2
date: 2005/01/10 18:37:28; author: mlhuang; state: Exp; lines: +1 -1
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:49:05 +0000 (20:49 +0000)]
- merge revision 1.3
date: 2005/01/17 20:07:16; author: mlhuang; state: Exp; lines: +10 -2
- patch from https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=40
fixes crash if PPTP packets are received out of order
- PPTP headers are variable length. Specifically, PPTP ACKs without
sequence numbers are 4 bytes shorter and will not be properly
tracked. Pass the minimum length required to skb_header_pointer() when
trying to parse a generic PPTP header out of a packet.
- Fix a call to DUMP_TUPLE_GRE()
- merge revision 1.2
date: 2005/01/10 19:06:38; author: mlhuang; state: Exp; lines: +12 -13
- fix DEBUGP() macro; newer gcc versions refuse to concatenate __FILE__
and __FUNCTION__
- fix DUMP_TUPLE_GRE() macro
- 2.6.9 changed print_tuple() and print_conntrack() methods to use
seq_printf(), but we are running 2.6.8, so change to just sprintf()
- merge revision 1.1
date: 2005/01/10 18:29:17; author: mlhuang; state: Exp;
patch-o-matic-ng-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:48:46 +0000 (20:48 +0000)]
- merge revision 1.2
date: 2005/01/10 18:37:06; author: mlhuang; state: Exp; lines: +2 -2
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:47:56 +0000 (20:47 +0000)]
- merge revision 1.2
date: 2005/01/10 19:05:12; author: mlhuang; state: Exp; lines: +60 -59
- fix DEBUGP() macro; newer gcc versions refuse to concatenate __FILE__
and __FUNCTION__
- exp_gre: expectations must now be allocated by the helper/caller; it's
been this way for at least a year, this patch was probably never
tested
- merge revision 1.1
date: 2005/01/10 18:29:17; author: mlhuang; state: Exp;
patch-o-matic-ng-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:47:40 +0000 (20:47 +0000)]
- merge revision 1.7
date: 2005/01/10 18:58:16; author: mlhuang; state: Exp; lines: +9 -7
patch-o-matic-
20050103 pptp-conntrack-nat
- merge revision 1.6
date: 2005/01/10 18:36:52; author: mlhuang; state: Exp; lines: +22 -4
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:47:09 +0000 (20:47 +0000)]
- merge revision 1.3
date: 2005/01/10 18:34:43; author: mlhuang; state: Exp; lines: +1 -1
patch-o-matic-ng-
20050103 conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:46:55 +0000 (20:46 +0000)]
- merge revision 1.3
date: 2005/01/10 19:02:29; author: mlhuang; state: Exp; lines: +8 -0
patch-o-matic-ng-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:46:42 +0000 (20:46 +0000)]
- merge revision 1.3
date: 2005/01/10 18:31:25; author: mlhuang; state: Exp; lines: +45 -0
patch-o-matic-ng-
20050103 pptp-conntrack-nat conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:46:24 +0000 (20:46 +0000)]
- merge revision 1.10
date: 2005/01/17 20:01:59; author: mlhuang; state: Exp; lines: +5 -2
- PL3791 fix: Suppress ICMP Unreachable if the port was bound to a (presumably raw) socket
Mark Huang [Thu, 27 Jan 2005 20:46:12 +0000 (20:46 +0000)]
- merge revision 1.14
date: 2005/01/17 20:02:29; author: mlhuang; state: Exp; lines: +2 -1
- PL3791 fix: Suppress RST if the port was bound to a (presumably raw) socket
Mark Huang [Thu, 27 Jan 2005 20:45:52 +0000 (20:45 +0000)]
- PL3976 fix: inet_release(): don't reset sk_xid
Mark Huang [Thu, 27 Jan 2005 20:45:09 +0000 (20:45 +0000)]
- merge revision 1.3
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +1 -3
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:44:59 +0000 (20:44 +0000)]
- merge revision 1.4
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +3 -4
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:44:12 +0000 (20:44 +0000)]
- merge revision 1.2
date: 2005/01/10 18:55:08; author: mlhuang; state: Exp; lines: +17 -5
patch-o-matic-ng-
20050103 pptp-conntrack-nat
Mark Huang [Thu, 27 Jan 2005 20:43:25 +0000 (20:43 +0000)]
- merge revision 1.5
date: 2005/01/10 18:30:56; author: mlhuang; state: Exp; lines: +23 -2
patch-o-matic-ng-
20050103 pptp-conntrack-nat conntrack-acct
Mark Huang [Thu, 27 Jan 2005 20:43:12 +0000 (20:43 +0000)]
- merge revision 1.6
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +4 -0
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:39:19 +0000 (20:39 +0000)]
- merge revision 1.7
date: 2005/01/10 19:31:58; author: mlhuang; state: Exp; lines: +14 -0
- backport 2.6.9 addition of skb_header_pointer() macro to support
pptp-conntrack-nat patch
Mark Huang [Thu, 27 Jan 2005 20:39:08 +0000 (20:39 +0000)]
- merge revision 1.10
date: 2005/01/04 18:46:08; author: mlhuang; state: Exp; lines: +1 -1
- fix do_mprotect() prototype
Mark Huang [Thu, 27 Jan 2005 20:38:55 +0000 (20:38 +0000)]
- merge revision 1.2
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +2 -2
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:38:42 +0000 (20:38 +0000)]
- merge revision 1.5
date: 2005/01/19 22:42:27; author: mef; state: Exp; lines: +12 -20
Fixes CAN-2004 security reports 1016, 1017, and 1068
Mark Huang [Thu, 27 Jan 2005 20:38:27 +0000 (20:38 +0000)]
- bump release number to 7.planetlab for RC10
Planet-Lab Support [Fri, 21 Jan 2005 03:34:24 +0000 (03:34 +0000)]
This commit was manufactured by cvs2svn to create branch
'planetlab-3_0-branch'.
Mark Huang [Tue, 11 Jan 2005 21:45:28 +0000 (21:45 +0000)]
- bump release number for RC8
Steve Muir [Tue, 11 Jan 2005 21:14:32 +0000 (21:14 +0000)]
Move 'lost SIGALRM' fixes to v3 branch
Mark Huang [Sun, 19 Dec 2004 04:27:18 +0000 (04:27 +0000)]
put Proper patches back in since they are probably not the cause of the kernel crashes
Mark Huang [Tue, 30 Nov 2004 23:13:02 +0000 (23:13 +0000)]
kernel is crashing in scheduler_tick() for unknown reasons; back out Proper patches temporarily to see if this helps
Mark Huang [Tue, 30 Nov 2004 16:47:39 +0000 (16:47 +0000)]
bump subrelease number
Mark Huang [Tue, 30 Nov 2004 16:46:45 +0000 (16:46 +0000)]
- merge revision 1.3
date: 2004/11/23 15:00:18; author: smuir; state: Exp; lines: +2 -2
Fix comment
----------------------------
- merge revision 1.2
date: 2004/11/18 20:06:31; author: smuir; state: Exp; lines: +33 -1
Need a way to manipulate vserver file attrs using a file descriptor
Mark Huang [Tue, 30 Nov 2004 16:46:21 +0000 (16:46 +0000)]
- merge revision 1.14
date: 2004/11/30 16:32:22; author: mlhuang; state: Exp; lines: +1 -2
- return -EPERM instead of silently freeing
----------------------------
- merge revision 1.13
date: 2004/11/30 15:59:12; author: mef; state: Exp; lines: +4 -1
PL3069
Fixed memory leak of skbuff. Requires changes to accurately do statistics
and some additional cosmetic changes. But this should be sufficient for
the next release candidate.
Mark Huang [Tue, 30 Nov 2004 16:45:53 +0000 (16:45 +0000)]
- merge revision 1.2
date: 2004/11/18 20:06:31; author: smuir; state: Exp; lines: +8 -1
Need a way to manipulate vserver file attrs using a file descriptor
Mark Huang [Tue, 30 Nov 2004 16:45:28 +0000 (16:45 +0000)]
- merge revision 1.6
date: 2004/11/23 15:11:39; author: mlhuang; state: Exp; lines: +5 -0
- apply patch to enable legacy ioctl() programs such as 0.30 stable
util-vserver showattr/setattr to set the immulink and barrier
high bits
- this is patch-2.6.9-final-vs1.9.3-rc3-legacyimmulinkioctl.patch
From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2, even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/18/04 12:48 am
Mark Huang [Tue, 30 Nov 2004 16:45:13 +0000 (16:45 +0000)]
- merge revision 1.3
date: 2004/11/23 15:11:15; author: mlhuang; state: Exp; lines: +5 -0
- apply patch to enable legacy ioctl() programs such as 0.30 stable
util-vserver showattr/setattr to set the immulink and barrier
high bits
- this is patch-2.6.9-final-vs1.9.3-rc3-legacyimmulinkioctl.patch
From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2, even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/18/04 12:48 am
Mark Huang [Tue, 30 Nov 2004 16:44:52 +0000 (16:44 +0000)]
- merge revision 1.3
date: 2004/11/23 15:08:22; author: mlhuang; state: Exp; lines: +4 -0
PL3131 fix: prevent vservers from escaping chroot() barriers
Mark Huang [Tue, 30 Nov 2004 16:44:31 +0000 (16:44 +0000)]
- merge revision 1.8
date: 2004/11/23 15:07:34; author: mlhuang; state: Exp; lines: +4 -4
- apply ioctl() patch to make sure that only superuser or someone
capable of setting the immutable bit, can set the immulink bit
From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2, even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/19/04 12:17 am
Here's the missing link.
Mark Huang [Tue, 30 Nov 2004 16:44:08 +0000 (16:44 +0000)]
- merge revision 1.8
date: 2004/11/23 15:08:03; author: mlhuang; state: Exp; lines: +1 -1
- make sure that all extended attributes are passed properly to the
inode structure
Mark Huang [Tue, 30 Nov 2004 16:43:46 +0000 (16:43 +0000)]
- merge revision 1.5
date: 2004/11/23 15:15:05; author: mlhuang; state: Exp; lines: +4 -0
PL3131 fix: prevent vservers from escaping chroot() barriers
Mark Huang [Tue, 30 Nov 2004 16:43:25 +0000 (16:43 +0000)]
- merge revision 1.5
date: 2004/11/23 15:07:40; author: mlhuang; state: Exp; lines: +4 -4
- apply ioctl() patch to make sure that only superuser or someone
capable of setting the immutable bit, can set the immulink bit
From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2, even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/19/04 12:17 am
Here's the missing link.
Mark Huang [Tue, 30 Nov 2004 16:43:03 +0000 (16:43 +0000)]
- merge revision 1.7
date: 2004/11/23 15:04:35; author: mlhuang; state: Exp; lines: +1 -1
- make sure that all extended attributes are passed properly to the
inode structure
Mark Huang [Tue, 30 Nov 2004 16:42:45 +0000 (16:42 +0000)]
- merge revision 1.4
date: 2004/11/23 15:03:26; author: mlhuang; state: Exp; lines: +4 -0
PL3131 fix: prevent vservers from escaping chroot() barriers
Mark Huang [Tue, 30 Nov 2004 16:42:14 +0000 (16:42 +0000)]
- merge revision 1.11
date: 2004/11/23 15:03:17; author: mlhuang; state: Exp; lines: +4 -0
PL3131 fix: prevent vservers from escaping chroot() barriers
----------------------------
- merge revision 1.10
date: 2004/11/17 18:59:31; author: smuir; state: Exp; lines: +0 -16
Remove XID check that prevents one vserver from reading files created in
another vserver but made visible by, say, a bind mount
Mark Huang [Tue, 30 Nov 2004 16:40:31 +0000 (16:40 +0000)]
- merge revision 1.6
date: 2004/11/18 20:06:31; author: smuir; state: Exp; lines: +13 -0
Need a way to manipulate vserver file attrs using a file descriptor
Andy Bavier [Tue, 16 Nov 2004 20:05:31 +0000 (20:05 +0000)]
Fixed vserver memory accounting bug. Between v1.8 and v1.9, a call to vx_rsspages_inc() was lost; restored now.
Mark Huang [Mon, 15 Nov 2004 18:01:54 +0000 (18:01 +0000)]
bump subrelease number
Mark Huang [Mon, 15 Nov 2004 17:58:05 +0000 (17:58 +0000)]
- merge revision 1.11
date: 2004/11/09 16:48:52; author: mef; state: Exp; lines: +1 -2
Turned off CKRM memory controller.
Waiting for PL2899 to be resolved, which involves waiting for the
CKRM/IBM folks.
Mark Huang [Mon, 8 Nov 2004 17:27:11 +0000 (17:27 +0000)]
bump subrelease number
Mark Huang [Mon, 8 Nov 2004 16:19:49 +0000 (16:19 +0000)]
- merge revision 1.7
date: 2004/11/05 09:56:50; author: mef; state: Exp; lines: +1 -1
This patch fixes a crash problem in rbce when a class is deleted
Problem is that the as part of running the rules_list the class
is effectively deleted through put_class thus the value of cls->classtype
is undefined. Since on entry cls->classtype == classtype use
parameter classtype instead.
Hubertus Frankeh (frankeh@us.ibm.com)
Mark Huang [Mon, 8 Nov 2004 16:18:55 +0000 (16:18 +0000)]
- merge 1.10
- PL292: bump RLIMIT_NOFILE (a.k.a. INR_OPEN) to 4096 from 1024
Planet-Lab Support [Thu, 4 Nov 2004 16:32:46 +0000 (16:32 +0000)]
This commit was manufactured by cvs2svn to create branch
'planetlab-3_0-branch'.
Marc Fiuczynski [Wed, 15 Sep 2004 17:11:48 +0000 (17:11 +0000)]
kernel.org 2.6.8.1
Planet-Lab Support [Wed, 15 Sep 2004 17:00:01 +0000 (17:00 +0000)]
This commit was manufactured by cvs2svn to create branch ''.
Marc Fiuczynski [Mon, 12 Jul 2004 21:57:21 +0000 (21:57 +0000)]
linux-2_6_7
Planet-Lab Support [Tue, 8 Jun 2004 17:13:53 +0000 (17:13 +0000)]
This commit was manufactured by cvs2svn to create branch ''.
Mark Huang [Wed, 2 Jun 2004 19:23:34 +0000 (19:23 +0000)]
ftp://ftp./pub/linux/kernel/v2.6/linux-2.6.6.tar.bz2