Re: Linux 2.6.18.6
diff --git a/Makefile b/Makefile index 85d8009..c8b2f7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME=Avast! A bilge rat! # *DOCUMENTATION* diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 3173924..e8f7436 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -331,6 +331,19 @@ CALL(sys_mbind) /* 320 */ CALL(sys_get_mempolicy) CALL(sys_set_mempolicy) + CALL(sys_openat) + CALL(sys_mkdirat) + CALL(sys_mknodat) +/* 325 */ CALL(sys_fchownat) + CALL(sys_futimesat) + CALL(sys_fstatat64) + CALL(sys_unlinkat) + CALL(sys_renameat) +/* 330 */ CALL(sys_linkat) + CALL(sys_symlinkat) + CALL(sys_readlinkat) + CALL(sys_fchmodat) + CALL(sys_faccessat) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index ac6d840..5b01fd2 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -23,35 +23,35 @@ * updated in fork.c:copy_thread, signal.c:do_signal, * ptrace.c and ptrace.h * - * M32Rx/M32R2 M32R - * @(sp) - r4 ditto - * @(0x04,sp) - r5 ditto - * @(0x08,sp) - r6 ditto - * @(0x0c,sp) - *pt_regs ditto - * @(0x10,sp) - r0 ditto - * @(0x14,sp) - r1 ditto - * @(0x18,sp) - r2 ditto - * @(0x1c,sp) - r3 ditto - * @(0x20,sp) - r7 ditto - * @(0x24,sp) - r8 ditto - * @(0x28,sp) - r9 ditto - * @(0x2c,sp) - r10 ditto - * @(0x30,sp) - r11 ditto - * @(0x34,sp) - r12 ditto - * @(0x38,sp) - syscall_nr ditto - * @(0x3c,sp) - acc0h@(0x3c,sp) - acch - * @(0x40,sp) - acc0l@(0x40,sp) - accl - * @(0x44,sp) - acc1h@(0x44,sp) - dummy_acc1h - * @(0x48,sp) - acc1l@(0x48,sp) - dummy_acc1l - * @(0x4c,sp) - psw ditto - * @(0x50,sp) - bpc ditto - * @(0x54,sp) - bbpswditto - * @(0x58,sp) - bbpc ditto - * @(0x5c,sp) - spu (cr3)ditto - * @(0x60,sp) - fp (r13) ditto - * @(0x64,sp) - lr (r14) ditto - * @(0x68,sp) - spi (cr2)ditto - * @(0x6c,sp) - orig_r0 ditto + * M32R/M32Rx/M32R2 + * @(sp) - r4 + * @(0x04,sp) - r5 + * @(0x08,sp) - r6 + * @(0x0c,sp) - *pt_regs + * @(0x10,sp) - r0 + * @(0x14,sp) - r1 + * @(0x18,sp) - r2 + * @(0x1c,sp) - r3 + * @(0x20,sp) - r7 + * @(0x24,sp) - r8 + * @(0x28,sp) - r9 + * @(0x2c,sp) - r10 + * @(0x30,sp) - r11 + * @(0x34,sp) - r12 + * @(0x38,sp) - syscall_nr + * @(0x3c,sp) - acc0h + * @(0x40,sp) - acc0l + * @(0x44,sp) - acc1h; ISA_DSP_LEVEL2 only + * @(0x48,sp) - acc1l; ISA_DSP_LEVEL2 only + * @(0x4c,sp) - psw + * @(0x50,sp) - bpc + * @(0x54,sp) - bbpsw + * @(0x58,sp) - bbpc + * @(0x5c,sp) - spu (cr3) + * @(0x60,sp) - fp (r13) + * @(0x64,sp) - lr (r14) + * @(0x68,sp) - spi (cr2) + * @(0x6c,sp) - orig_r0 */ #include @@ -95,17 +95,10 @@ #define R11(reg) @(0x30,reg) #define R12(reg) @(0x34,reg) #define SYSCALL_NR(reg)@(0x38,reg) -#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2) #define ACC0H(reg) @(0x3C,reg) #define ACC0L(reg) @(0x40,reg) #define ACC1H(reg) @(0x44,reg) #define ACC1L(reg) @(0x48,reg) -#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) -#define ACCH(reg) @(0x3C,reg) -#define ACCL(reg) @(0x40,reg) -#else -#error unknown isa configuration -#endif #define PSW(reg) @(0x4C,reg) #define BPC(reg) @(0x50,reg) #define BBPSW(reg) @(0x54,reg) diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 34afad7..ffcb9e4 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -1010,7 +1010,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) if ((c->x86 == 0xf && c->x86_model >= 0x03) || (c->x86 == 0x6 && c->x86_model >= 0x0e)) set_bit(X86_FEATURE_CONSTANT_TSC, >x86_capability); - set_bit(X86_FEATURE_SYNC_RDTSC, >x86_capability); + if (c->x86 == 15) + set_bit(X86_FEATURE_SYNC_RDTSC, >x86_capability); + else +
Linux 2.6.18.6
We (the -stable team) are announcing the release of the 2.6.18.6 kernel.
An assortment of important fixes with one security related fix that is
associated with less common bluetooth hardware:
1dca7c28: Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106)
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between
2.6.18.5 and 2.6.18.6, as it is small enough to do so.
The updated 2.6.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
-chris
Makefile |2
arch/arm/kernel/calls.S | 13 +
arch/m32r/kernel/entry.S | 65 +++---
arch/x86_64/kernel/setup.c|5 +-
drivers/ieee1394/ohci1394.c | 21 ++--
drivers/md/dm-crypt.c |6 +-
drivers/md/dm-snap.c |1
drivers/media/dvb/frontends/lgdt330x.c|6 --
drivers/media/video/tuner-simple.c|2
drivers/media/video/tuner-types.c | 14 -
drivers/net/bonding/bond_main.c |2
drivers/net/forcedeth.c |3 +
drivers/net/sunhme.c |5 ++
fs/compat.c |2
include/asm-arm/unistd.h | 13 +
include/asm-m32r/ptrace.h | 28 +--
include/asm-m32r/sigcontext.h | 13 -
kernel/softirq.c |2
net/bluetooth/cmtp/capi.c | 39 +--
net/bridge/netfilter/ebtables.c | 54 +
net/ieee80211/softmac/ieee80211softmac_scan.c |2
net/ipv4/netfilter/ip_tables.c|5 +-
net/ipv4/route.c |2
net/ipv4/xfrm4_policy.c |2
net/irda/irttp.c |4 -
net/sched/act_gact.c |4 -
net/sched/act_police.c| 26 --
27 files changed, 199 insertions(+), 142 deletions(-)
Summary of changes from v2.6.18.5 to v2.6.18.6
Al Viro (4):
EBTABLES: Fix wraparounds in ebt_entries verification.
EBTABLES: Verify that ebt_entries have zero ->distinguisher.
EBTABLES: Deal with the worst-case behaviour in loop checks.
EBTABLES: Prevent wraparounds in checks for entry components' sizes.
Andrey Mirkin (1):
skip data conversion in compat_sys_mount when data_page is NULL
Andy Gospodarek (1):
bonding: incorrect bonding state reported via ioctl
Arjan van de Ven (1):
x86-64: Mark rdtsc as sync only for netburst, not for core2
Chris Wright (1):
Linux 2.6.18.6
Christophe Saout (1):
dm crypt: Fix data corruption with dm-crypt over RAID5
Daniel Barkalow (1):
forcedeth: Disable INTx when enabling MSI in forcedeth
David Miller (3):
PKT_SCHED act_gact: division by zero
XFRM: Use output device disable_xfrm for forwarded packets
IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries.
Hans Verkuil (1):
V4L: Fix broken TUNER_LG_NTSC_TAPE radio support
Hirokazu Takata (1):
m32r: make userspace headers platform-independent
Jeet Chaudhuri (1):
IrDA: Incorrect TTP header reservation
Jurij Smakov (1):
SUNHME: Fix for sunhme failures on x86
Marcel Holtmann (1):
Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106)
Michael Buesch (1):
softmac: remove netif_tx_disable when scanning
Michael Krufky (1):
DVB: lgdt330x: fix signal / lock status detection bug
Milan Broz (1):
dm snapshot: fix freeing pending exception
Patrick McHardy (2):
NET_SCHED: policer: restore compatibility with old iproute binaries
NETFILTER: ip_tables: revision support for compat code
Russell King (1):
ARM: Add sys_*at syscalls
Stefan Richter (1):
ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
Zachary Amsden (1):
softirq: remove BUG_ONs which can incorrectly trigger
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Linux 2.6.18.6
We (the -stable team) are announcing the release of the 2.6.18.6 kernel. An assortment of important fixes with one security related fix that is associated with less common bluetooth hardware: 1dca7c28: Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106) The diffstat and short summary of the fixes are below. I'll also be replying to this message with a copy of the patch between 2.6.18.5 and 2.6.18.6, as it is small enough to do so. The updated 2.6.18.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git and can be browsed at the normal kernel.org git web browser: www.kernel.org/git/ thanks, -chris Makefile |2 arch/arm/kernel/calls.S | 13 + arch/m32r/kernel/entry.S | 65 +++--- arch/x86_64/kernel/setup.c|5 +- drivers/ieee1394/ohci1394.c | 21 ++-- drivers/md/dm-crypt.c |6 +- drivers/md/dm-snap.c |1 drivers/media/dvb/frontends/lgdt330x.c|6 -- drivers/media/video/tuner-simple.c|2 drivers/media/video/tuner-types.c | 14 - drivers/net/bonding/bond_main.c |2 drivers/net/forcedeth.c |3 + drivers/net/sunhme.c |5 ++ fs/compat.c |2 include/asm-arm/unistd.h | 13 + include/asm-m32r/ptrace.h | 28 +-- include/asm-m32r/sigcontext.h | 13 - kernel/softirq.c |2 net/bluetooth/cmtp/capi.c | 39 +-- net/bridge/netfilter/ebtables.c | 54 + net/ieee80211/softmac/ieee80211softmac_scan.c |2 net/ipv4/netfilter/ip_tables.c|5 +- net/ipv4/route.c |2 net/ipv4/xfrm4_policy.c |2 net/irda/irttp.c |4 - net/sched/act_gact.c |4 - net/sched/act_police.c| 26 -- 27 files changed, 199 insertions(+), 142 deletions(-) Summary of changes from v2.6.18.5 to v2.6.18.6 Al Viro (4): EBTABLES: Fix wraparounds in ebt_entries verification. EBTABLES: Verify that ebt_entries have zero -distinguisher. EBTABLES: Deal with the worst-case behaviour in loop checks. EBTABLES: Prevent wraparounds in checks for entry components' sizes. Andrey Mirkin (1): skip data conversion in compat_sys_mount when data_page is NULL Andy Gospodarek (1): bonding: incorrect bonding state reported via ioctl Arjan van de Ven (1): x86-64: Mark rdtsc as sync only for netburst, not for core2 Chris Wright (1): Linux 2.6.18.6 Christophe Saout (1): dm crypt: Fix data corruption with dm-crypt over RAID5 Daniel Barkalow (1): forcedeth: Disable INTx when enabling MSI in forcedeth David Miller (3): PKT_SCHED act_gact: division by zero XFRM: Use output device disable_xfrm for forwarded packets IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries. Hans Verkuil (1): V4L: Fix broken TUNER_LG_NTSC_TAPE radio support Hirokazu Takata (1): m32r: make userspace headers platform-independent Jeet Chaudhuri (1): IrDA: Incorrect TTP header reservation Jurij Smakov (1): SUNHME: Fix for sunhme failures on x86 Marcel Holtmann (1): Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106) Michael Buesch (1): softmac: remove netif_tx_disable when scanning Michael Krufky (1): DVB: lgdt330x: fix signal / lock status detection bug Milan Broz (1): dm snapshot: fix freeing pending exception Patrick McHardy (2): NET_SCHED: policer: restore compatibility with old iproute binaries NETFILTER: ip_tables: revision support for compat code Russell King (1): ARM: Add sys_*at syscalls Stefan Richter (1): ieee1394: ohci1394: add PPC_PMAC platform code to driver probe Zachary Amsden (1): softirq: remove BUG_ONs which can incorrectly trigger - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.18.6
diff --git a/Makefile b/Makefile index 85d8009..c8b2f7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME=Avast! A bilge rat! # *DOCUMENTATION* diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 3173924..e8f7436 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -331,6 +331,19 @@ CALL(sys_mbind) /* 320 */ CALL(sys_get_mempolicy) CALL(sys_set_mempolicy) + CALL(sys_openat) + CALL(sys_mkdirat) + CALL(sys_mknodat) +/* 325 */ CALL(sys_fchownat) + CALL(sys_futimesat) + CALL(sys_fstatat64) + CALL(sys_unlinkat) + CALL(sys_renameat) +/* 330 */ CALL(sys_linkat) + CALL(sys_symlinkat) + CALL(sys_readlinkat) + CALL(sys_fchmodat) + CALL(sys_faccessat) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) ~3) - NR_syscalls #define syscalls_counted diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index ac6d840..5b01fd2 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -23,35 +23,35 @@ * updated in fork.c:copy_thread, signal.c:do_signal, * ptrace.c and ptrace.h * - * M32Rx/M32R2 M32R - * @(sp) - r4 ditto - * @(0x04,sp) - r5 ditto - * @(0x08,sp) - r6 ditto - * @(0x0c,sp) - *pt_regs ditto - * @(0x10,sp) - r0 ditto - * @(0x14,sp) - r1 ditto - * @(0x18,sp) - r2 ditto - * @(0x1c,sp) - r3 ditto - * @(0x20,sp) - r7 ditto - * @(0x24,sp) - r8 ditto - * @(0x28,sp) - r9 ditto - * @(0x2c,sp) - r10 ditto - * @(0x30,sp) - r11 ditto - * @(0x34,sp) - r12 ditto - * @(0x38,sp) - syscall_nr ditto - * @(0x3c,sp) - acc0h@(0x3c,sp) - acch - * @(0x40,sp) - acc0l@(0x40,sp) - accl - * @(0x44,sp) - acc1h@(0x44,sp) - dummy_acc1h - * @(0x48,sp) - acc1l@(0x48,sp) - dummy_acc1l - * @(0x4c,sp) - psw ditto - * @(0x50,sp) - bpc ditto - * @(0x54,sp) - bbpswditto - * @(0x58,sp) - bbpc ditto - * @(0x5c,sp) - spu (cr3)ditto - * @(0x60,sp) - fp (r13) ditto - * @(0x64,sp) - lr (r14) ditto - * @(0x68,sp) - spi (cr2)ditto - * @(0x6c,sp) - orig_r0 ditto + * M32R/M32Rx/M32R2 + * @(sp) - r4 + * @(0x04,sp) - r5 + * @(0x08,sp) - r6 + * @(0x0c,sp) - *pt_regs + * @(0x10,sp) - r0 + * @(0x14,sp) - r1 + * @(0x18,sp) - r2 + * @(0x1c,sp) - r3 + * @(0x20,sp) - r7 + * @(0x24,sp) - r8 + * @(0x28,sp) - r9 + * @(0x2c,sp) - r10 + * @(0x30,sp) - r11 + * @(0x34,sp) - r12 + * @(0x38,sp) - syscall_nr + * @(0x3c,sp) - acc0h + * @(0x40,sp) - acc0l + * @(0x44,sp) - acc1h; ISA_DSP_LEVEL2 only + * @(0x48,sp) - acc1l; ISA_DSP_LEVEL2 only + * @(0x4c,sp) - psw + * @(0x50,sp) - bpc + * @(0x54,sp) - bbpsw + * @(0x58,sp) - bbpc + * @(0x5c,sp) - spu (cr3) + * @(0x60,sp) - fp (r13) + * @(0x64,sp) - lr (r14) + * @(0x68,sp) - spi (cr2) + * @(0x6c,sp) - orig_r0 */ #include linux/linkage.h @@ -95,17 +95,10 @@ #define R11(reg) @(0x30,reg) #define R12(reg) @(0x34,reg) #define SYSCALL_NR(reg)@(0x38,reg) -#if defined(CONFIG_ISA_M32R2) defined(CONFIG_ISA_DSP_LEVEL2) #define ACC0H(reg) @(0x3C,reg) #define ACC0L(reg) @(0x40,reg) #define ACC1H(reg) @(0x44,reg) #define ACC1L(reg) @(0x48,reg) -#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) -#define ACCH(reg) @(0x3C,reg) -#define ACCL(reg) @(0x40,reg) -#else -#error unknown isa configuration -#endif #define PSW(reg) @(0x4C,reg) #define BPC(reg) @(0x50,reg) #define BBPSW(reg) @(0x54,reg) diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 34afad7..ffcb9e4 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -1010,7 +1010,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) if ((c-x86 == 0xf c-x86_model = 0x03) || (c-x86 == 0x6 c-x86_model = 0x0e)) set_bit(X86_FEATURE_CONSTANT_TSC, c-x86_capability); - set_bit(X86_FEATURE_SYNC_RDTSC, c-x86_capability); + if (c-x86 == 15) + set_bit(X86_FEATURE_SYNC_RDTSC, c-x86_capability); + else +
