Latest 2.6.34 patch does not work with 2.6.34.6

[hanno]

I get some failures and some reverse patch messages when trying to apply
grsecurity-2.2.0-2.6.34.4-201008131840.patch
on top of 2.6.34.6.

Can you provide an updated patch?

[spender]

I've just uploaded new patches for 2.6.32.21 and 2.6.34.6.

-Brad

[Troppauer]

Hi,

I have a problem with 2.6.34.6+grsecurity-2.2.0-2.6.34.6-201009130754.patch see below:


details from kernel compile (at almost all sources):

.
.
.

/usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:394:1: warning: this is the location of the previous definition
CC arch/x86/lib/atomic64_32.o
In file included from /usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:495,
from /usr/src/linux-2.6.34.6/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/x86/lib/atomic64_32.c:2:
include/asm-generic/atomic-long.h:401:1: warning: "atomic_inc_return_unchecked" redefined
In file included from /usr/src/linux-2.6.34.6/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/x86/lib/atomic64_32.c:2:
/usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:394:1: warning: this is the location of the previous definition
In file included from /usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:495,
from /usr/src/linux-2.6.34.6/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/x86/lib/atomic64_32.c:2:
include/asm-generic/atomic-long.h:401:1: warning: "atomic_inc_return_unchecked" redefined
In file included from /usr/src/linux-2.6.34.6/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/x86/lib/atomic64_32.c:2:
/usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:394:1: warning: this is the location of the previous definition
LD arch/x86/lib/built-in.o
AS arch/x86/lib/checksum_32.o
CC arch/x86/lib/delay.o
In file included from /usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:495,
from /usr/src/linux-2.6.34.6/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from arch/x86/lib/delay.c:14:
include/asm-generic/atomic-long.h:401:1: warning: "atomic_inc_return_unchecked" redefined

.
.
.


Best Regards,

[PaX Team]

/usr/src/linux-2.6.34.6/arch/x86/include/asm/atomic.h:394:1: warning: this is the location of the previous definition

oops, my fault, will be fixed in the next patch. as a sidenote, you should enable REFCOUNT .

[Troppauer]

ok, thanks, but i don't use PaX for the present, just the grsec's jail protections.

Regards,
Laszlo Halasz
from Hungary

[cmouse]

This same problem exists in patch for 2.6.32.21. If CONFIG_REFCOUNT=n you get this warning.

[spender]

It's been fixed in the latest patches.

-Brad

[Shadow]

This is still happening on 2.6.32.21 (grsecurity-2.2.0-2.6.32.21-201009171945.patch)

include/asm-generic/atomic-long.h:401:1: warning: "atomic_inc_return_unchecked" redefined
In file included from /var/portage/tmp/portage/sys-kernel/gt-sources-2.6.32.21-r1/work/linux-2.6.32.21/arch/x86/include/asm/atomic.h:4,
from /var/portage/tmp/portage/sys-kernel/gt-sources-2.6.32.21-r1/work/linux-2.6.32.21/arch/x86/include/asm/thread_info.h:24,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from drivers/net/xen-netfront.c:32:
/var/portage/tmp/portage/sys-kernel/gt-sources-2.6.32.21-r1/work/linux-2.6.32.21/arch/x86/include/asm/atomic_64.h:373:1: warning: this is the location of the previous definition

[spender]

I've uploaded a new patch for 2.6.32.21 to resolve this (the fix was different than for 2.6.34.7 and 2.6.35.4).

-Brad

[Shadow]

That was fast, confirmed as fixed. Thanks!