packages: kernel/kernel-aufs2-no-const-grsec.patch, kernel/kernel-grsec-com...
arekm
arekm at pld-linux.org
Mon Jan 17 12:14:31 CET 2011
Author: arekm Date: Mon Jan 17 11:14:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial grsecurity update to grsecurity-2.2.1-2.6.37-201101170305.patch
---- Files affected:
packages/kernel:
kernel-aufs2-no-const-grsec.patch (1.1 -> 1.2) , kernel-grsec-common.patch (1.2 -> 1.3) , kernel-grsec_fixes.patch (1.17 -> 1.18) , kernel-grsec_full.patch (1.54 -> 1.55) , kernel.spec (1.870 -> 1.871)
---- Diffs:
================================================================
Index: packages/kernel/kernel-aufs2-no-const-grsec.patch
diff -u packages/kernel/kernel-aufs2-no-const-grsec.patch:1.1 packages/kernel/kernel-aufs2-no-const-grsec.patch:1.2
--- packages/kernel/kernel-aufs2-no-const-grsec.patch:1.1 Wed Sep 29 10:56:56 2010
+++ packages/kernel/kernel-aufs2-no-const-grsec.patch Mon Jan 17 12:14:23 2011
@@ -1,35 +1,34 @@
-diff -urNp linux-2.6.35.5/include/linux/fs.h linux-2.6.35.5/include/linux/fs.h
---- linux-2.6.35.5/include/linux/fs.h 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.5/include/linux/fs.h 2010-09-20 17:33:35.000000000 -0400
-@@ -572,41 +577,41 @@ typedef int (*read_actor_t)(read_descrip
+--- linux-2.6.37/include/linux/fs.h.org 2011-01-17 10:47:08.657197582 +0100
++++ linux-2.6.37/include/linux/fs.h 2011-01-17 10:48:36.572409097 +0100
+@@ -623,42 +623,42 @@
unsigned long, unsigned long);
struct address_space_operations {
- int (* const writepage)(struct page *page, struct writeback_control *wbc);
- int (* const readpage)(struct file *, struct page *);
- void (* const sync_page)(struct page *);
-+ int (*writepage)(struct page *page, struct writeback_control *wbc);
-+ int (*readpage)(struct file *, struct page *);
-+ void (*sync_page)(struct page *);
++ int (* writepage)(struct page *page, struct writeback_control *wbc);
++ int (* readpage)(struct file *, struct page *);
++ void (* sync_page)(struct page *);
/* Write back some dirty pages from this mapping. */
- int (* const writepages)(struct address_space *, struct writeback_control *);
-+ int (*writepages)(struct address_space *, struct writeback_control *);
++ int (* writepages)(struct address_space *, struct writeback_control *);
/* Set a page dirty. Return true if this dirtied it */
- int (* const set_page_dirty)(struct page *page);
-+ int (*set_page_dirty)(struct page *page);
++ int (* set_page_dirty)(struct page *page);
- int (* const readpages)(struct file *filp, struct address_space *mapping,
-+ int (*readpages)(struct file *filp, struct address_space *mapping,
++ int (* readpages)(struct file *filp, struct address_space *mapping,
struct list_head *pages, unsigned nr_pages);
- int (* const write_begin)(struct file *, struct address_space *mapping,
-+ int (*write_begin)(struct file *, struct address_space *mapping,
++ int (* write_begin)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata);
- int (* const write_end)(struct file *, struct address_space *mapping,
-+ int (*write_end)(struct file *, struct address_space *mapping,
++ int (* write_end)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied,
struct page *page, void *fsdata);
@@ -37,56 +36,56 @@
- sector_t (* const bmap)(struct address_space *, sector_t);
- void (* const invalidatepage) (struct page *, unsigned long);
- int (* const releasepage) (struct page *, gfp_t);
+- void (* const freepage)(struct page *);
- ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
-+ sector_t (*bmap)(struct address_space *, sector_t);
-+ void (*invalidatepage) (struct page *, unsigned long);
-+ int (*releasepage) (struct page *, gfp_t);
-+ ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
++ sector_t (* bmap)(struct address_space *, sector_t);
++ void (* invalidatepage) (struct page *, unsigned long);
++ int (* releasepage) (struct page *, gfp_t);
++ void (* freepage)(struct page *);
++ ssize_t (* direct_IO)(int, struct kiocb *, const struct iovec *iov,
loff_t offset, unsigned long nr_segs);
- int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
-+ int (*get_xip_mem)(struct address_space *, pgoff_t, int,
++ int (* get_xip_mem)(struct address_space *, pgoff_t, int,
void **, unsigned long *);
/* migrate the contents of a page to the specified target */
- int (* const migratepage) (struct address_space *,
-+ int (*migratepage) (struct address_space *,
++ int (* migratepage) (struct address_space *,
struct page *, struct page *);
- int (* const launder_page) (struct page *);
- int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
-+ int (*launder_page) (struct page *);
-+ int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
++ int (* launder_page) (struct page *);
++ int (* is_partially_uptodate) (struct page *, read_descriptor_t *,
unsigned long);
- int (* const error_remove_page)(struct address_space *, struct page *);
-+ int (*error_remove_page)(struct address_space *, struct page *);
++ int (* error_remove_page)(struct address_space *, struct page *);
};
/*
-@@ -1036,19 +1041,19 @@ static inline int file_check_writeable(s
+@@ -1098,18 +1098,18 @@
typedef struct files_struct *fl_owner_t;
struct file_lock_operations {
- void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
- void (* const fl_release_private)(struct file_lock *);
-+ void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
-+ void (*fl_release_private)(struct file_lock *);
++ void (* fl_copy_lock)(struct file_lock *, struct file_lock *);
++ void (* fl_release_private)(struct file_lock *);
};
struct lock_manager_operations {
- int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
- void (* const fl_notify)(struct file_lock *); /* unblock callback */
- int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
-- void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
- void (* const fl_release_private)(struct file_lock *);
- void (* const fl_break)(struct file_lock *);
- int (* const fl_mylease)(struct file_lock *, struct file_lock *);
- int (* const fl_change)(struct file_lock **, int);
-+ int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
-+ void (*fl_notify)(struct file_lock *); /* unblock callback */
-+ int (*fl_grant)(struct file_lock *, struct file_lock *, int);
-+ void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
-+ void (*fl_release_private)(struct file_lock *);
-+ void (*fl_break)(struct file_lock *);
-+ int (*fl_mylease)(struct file_lock *, struct file_lock *);
-+ int (*fl_change)(struct file_lock **, int);
++ int (* fl_compare_owner)(struct file_lock *, struct file_lock *);
++ void (* fl_notify)(struct file_lock *); /* unblock callback */
++ int (* fl_grant)(struct file_lock *, struct file_lock *, int);
++ void (* fl_release_private)(struct file_lock *);
++ void (* fl_break)(struct file_lock *);
++ int (* fl_mylease)(struct file_lock *, struct file_lock *);
++ int (* fl_change)(struct file_lock **, int);
};
struct lock_manager {
================================================================
Index: packages/kernel/kernel-grsec-common.patch
diff -u packages/kernel/kernel-grsec-common.patch:1.2 packages/kernel/kernel-grsec-common.patch:1.3
--- packages/kernel/kernel-grsec-common.patch:1.2 Tue Mar 31 14:04:38 2009
+++ packages/kernel/kernel-grsec-common.patch Mon Jan 17 12:14:23 2011
@@ -27,12 +27,13 @@
===
--- a/kernel/capability.c~ 2007-12-11 00:46:02.000000000 +0100
+++ a/kernel/capability.c 2007-12-11 01:35:00.244481500 +0100
-@@ -322,6 +322,8 @@
+@@ -330,6 +330,9 @@
+ BUG();
+ }
- int capable_nolog(int cap)
- {
+ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
+ return 0;
++
if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
current->flags |= PF_SUPERPRIV;
return 1;
================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.17 packages/kernel/kernel-grsec_fixes.patch:1.18
--- packages/kernel/kernel-grsec_fixes.patch:1.17 Sun Nov 7 08:43:08 2010
+++ packages/kernel/kernel-grsec_fixes.patch Mon Jan 17 12:14:23 2011
@@ -129,8 +129,8 @@
@@ -278,7 +278,7 @@
if (mask & CLONE_FS) {
- write_lock(&fs_vxi->lock);
- vxi->vx_fs[index] = fs;
+ spin_lock(&fs_vxi->lock);
+ space->vx_fs = fs;
- kill = !--fs_vxi->users;
+ kill = !atomic_dec_return(&fs_vxi->users);
spin_unlock(&fs_vxi->lock);
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.54 packages/kernel/kernel-grsec_full.patch:1.55
--- packages/kernel/kernel-grsec_full.patch:1.54 Tue Dec 21 21:58:24 2010
+++ packages/kernel/kernel-grsec_full.patch Mon Jan 17 12:14:23 2011
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.36.2/arch/alpha/include/asm/dma-mapping.h linux-2.6.36.2/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.36.2/arch/alpha/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/include/asm/dma-mapping.h 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/include/asm/dma-mapping.h linux-2.6.37/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/alpha/include/asm/dma-mapping.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/dma-mapping.h 2011-01-17 02:41:00.000000000 -0500
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
@@ -13,9 +13,9 @@
{
return dma_ops;
}
-diff -urNp linux-2.6.36.2/arch/alpha/include/asm/elf.h linux-2.6.36.2/arch/alpha/include/asm/elf.h
---- linux-2.6.36.2/arch/alpha/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/include/asm/elf.h 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/include/asm/elf.h linux-2.6.37/arch/alpha/include/asm/elf.h
+--- linux-2.6.37/arch/alpha/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +30,9 @@
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.36.2/arch/alpha/include/asm/pgtable.h linux-2.6.36.2/arch/alpha/include/asm/pgtable.h
---- linux-2.6.36.2/arch/alpha/include/asm/pgtable.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/include/asm/pgtable.h 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/include/asm/pgtable.h linux-2.6.37/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.37/arch/alpha/include/asm/pgtable.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/pgtable.h 2011-01-17 02:41:00.000000000 -0500
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -51,9 +51,9 @@
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.36.2/arch/alpha/kernel/module.c linux-2.6.36.2/arch/alpha/kernel/module.c
---- linux-2.6.36.2/arch/alpha/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/kernel/module.c 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/kernel/module.c linux-2.6.37/arch/alpha/kernel/module.c
+--- linux-2.6.37/arch/alpha/kernel/module.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/module.c 2011-01-17 02:41:00.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -63,9 +63,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.36.2/arch/alpha/kernel/osf_sys.c linux-2.6.36.2/arch/alpha/kernel/osf_sys.c
---- linux-2.6.36.2/arch/alpha/kernel/osf_sys.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/kernel/osf_sys.c 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/kernel/osf_sys.c linux-2.6.37/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.37/arch/alpha/kernel/osf_sys.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/osf_sys.c 2011-01-17 02:41:00.000000000 -0500
@@ -1165,7 +1165,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -97,9 +97,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.36.2/arch/alpha/kernel/pci_iommu.c linux-2.6.36.2/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.36.2/arch/alpha/kernel/pci_iommu.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/kernel/pci_iommu.c 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/kernel/pci_iommu.c linux-2.6.37/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
return 0;
}
@@ -116,9 +116,9 @@
-struct dma_map_ops *dma_ops = &alpha_pci_ops;
+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.36.2/arch/alpha/kernel/pci-noop.c linux-2.6.36.2/arch/alpha/kernel/pci-noop.c
---- linux-2.6.36.2/arch/alpha/kernel/pci-noop.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/kernel/pci-noop.c 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/kernel/pci-noop.c linux-2.6.37/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.37/arch/alpha/kernel/pci-noop.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/pci-noop.c 2011-01-17 02:41:00.000000000 -0500
@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
return 0;
}
@@ -137,9 +137,9 @@
EXPORT_SYMBOL(dma_ops);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.36.2/arch/alpha/mm/fault.c linux-2.6.36.2/arch/alpha/mm/fault.c
---- linux-2.6.36.2/arch/alpha/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/alpha/mm/fault.c 2010-12-09 20:25:02.000000000 -0500
+diff -urNp linux-2.6.37/arch/alpha/mm/fault.c linux-2.6.37/arch/alpha/mm/fault.c
+--- linux-2.6.37/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -296,9 +296,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.36.2/arch/arm/include/asm/elf.h linux-2.6.36.2/arch/arm/include/asm/elf.h
---- linux-2.6.36.2/arch/arm/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/include/asm/elf.h 2010-12-09 20:24:56.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/include/asm/elf.h linux-2.6.37/arch/arm/include/asm/elf.h
+--- linux-2.6.37/arch/arm/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
@@ -113,7 +113,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -315,7 +315,7 @@
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-@@ -123,8 +130,4 @@ int dump_task_regs(struct task_struct *t
+@@ -123,10 +130,6 @@ int dump_task_regs(struct task_struct *t
extern void elf_set_personality(const struct elf32_hdr *);
#define SET_PERSONALITY(ex) elf_set_personality(&(ex))
@@ -323,10 +323,12 @@
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
-
- #endif
-diff -urNp linux-2.6.36.2/arch/arm/include/asm/kmap_types.h linux-2.6.36.2/arch/arm/include/asm/kmap_types.h
---- linux-2.6.36.2/arch/arm/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/include/asm/kmap_types.h 2010-12-09 20:24:55.000000000 -0500
+ extern int vectors_user_mapping(void);
+ #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
+diff -urNp linux-2.6.37/arch/arm/include/asm/kmap_types.h linux-2.6.37/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.37/arch/arm/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
@@ -335,9 +337,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.36.2/arch/arm/include/asm/uaccess.h linux-2.6.36.2/arch/arm/include/asm/uaccess.h
---- linux-2.6.36.2/arch/arm/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/include/asm/uaccess.h 2010-12-09 20:24:55.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/include/asm/uaccess.h linux-2.6.37/arch/arm/include/asm/uaccess.h
+--- linux-2.6.37/arch/arm/include/asm/uaccess.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/uaccess.h 2011-01-17 02:41:00.000000000 -0500
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -358,9 +360,9 @@
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.36.2/arch/arm/kernel/kgdb.c linux-2.6.36.2/arch/arm/kernel/kgdb.c
---- linux-2.6.36.2/arch/arm/kernel/kgdb.c 2010-11-26 18:26:23.000000000 -0500
-+++ linux-2.6.36.2/arch/arm/kernel/kgdb.c 2010-12-09 20:24:59.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/kernel/kgdb.c linux-2.6.37/arch/arm/kernel/kgdb.c
+--- linux-2.6.37/arch/arm/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
@@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -370,31 +372,34 @@
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.36.2/arch/arm/kernel/process.c linux-2.6.36.2/arch/arm/kernel/process.c
---- linux-2.6.36.2/arch/arm/kernel/process.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/kernel/process.c 2010-12-09 20:24:59.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37/arch/arm/kernel/process.c
+--- linux-2.6.37/arch/arm/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
@@ -28,7 +28,6 @@
#include <linux/tick.h>
#include <linux/utsname.h>
#include <linux/uaccess.h>
-#include <linux/random.h>
+ #include <linux/hw_breakpoint.h>
#include <asm/cacheflush.h>
- #include <asm/leds.h>
-@@ -452,9 +451,3 @@ unsigned long get_wchan(struct task_stru
- } while (count ++ < 16);
+@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_stru
return 0;
}
--
+
-unsigned long arch_randomize_brk(struct mm_struct *mm)
-{
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-diff -urNp linux-2.6.36.2/arch/arm/mach-at91/pm.c linux-2.6.36.2/arch/arm/mach-at91/pm.c
---- linux-2.6.36.2/arch/arm/mach-at91/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-at91/pm.c 2010-12-09 20:24:59.000000000 -0500
-@@ -294,7 +294,7 @@ static void at91_pm_end(void)
+-
+ /*
+ * The vectors page is always readable from user space for the
+ * atomic helpers and the signal restart code. Let's declare a mapping
+diff -urNp linux-2.6.37/arch/arm/mach-at91/pm.c linux-2.6.37/arch/arm/mach-at91/pm.c
+--- linux-2.6.37/arch/arm/mach-at91/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-at91/pm.c 2011-01-17 02:41:00.000000000 -0500
+@@ -301,7 +301,7 @@ static void at91_pm_end(void)
}
@@ -403,9 +408,9 @@
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.36.2/arch/arm/mach-davinci/pm.c linux-2.6.36.2/arch/arm/mach-davinci/pm.c
---- linux-2.6.36.2/arch/arm/mach-davinci/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-davinci/pm.c 2010-12-09 20:24:58.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-davinci/pm.c linux-2.6.37/arch/arm/mach-davinci/pm.c
+--- linux-2.6.37/arch/arm/mach-davinci/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-davinci/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
return ret;
}
@@ -415,9 +420,9 @@
.enter = davinci_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.36.2/arch/arm/mach-imx/pm-imx27.c linux-2.6.36.2/arch/arm/mach-imx/pm-imx27.c
---- linux-2.6.36.2/arch/arm/mach-imx/pm-imx27.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-imx/pm-imx27.c 2010-12-09 20:24:58.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-imx/pm-imx27.c linux-2.6.37/arch/arm/mach-imx/pm-imx27.c
+--- linux-2.6.37/arch/arm/mach-imx/pm-imx27.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-imx/pm-imx27.c 2011-01-17 02:41:00.000000000 -0500
@@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_st
return 0;
}
@@ -427,9 +432,9 @@
.enter = mx27_suspend_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.36.2/arch/arm/mach-lpc32xx/pm.c linux-2.6.36.2/arch/arm/mach-lpc32xx/pm.c
---- linux-2.6.36.2/arch/arm/mach-lpc32xx/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-lpc32xx/pm.c 2010-12-09 20:24:59.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-lpc32xx/pm.c linux-2.6.37/arch/arm/mach-lpc32xx/pm.c
+--- linux-2.6.37/arch/arm/mach-lpc32xx/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-lpc32xx/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_stat
return 0;
}
@@ -439,20 +444,20 @@
.valid = suspend_valid_only_mem,
.enter = lpc32xx_pm_enter,
};
-diff -urNp linux-2.6.36.2/arch/arm/mach-msm/last_radio_log.c linux-2.6.36.2/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.36.2/arch/arm/mach-msm/last_radio_log.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-msm/last_radio_log.c 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-msm/last_radio_log.c linux-2.6.37/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.37/arch/arm/mach-msm/last_radio_log.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-msm/last_radio_log.c 2011-01-17 02:41:00.000000000 -0500
@@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
return count;
}
+/* cannot be const, see msm_init_last_radio_log */
static struct file_operations last_radio_log_fops = {
- .read = last_radio_log_read
- };
-diff -urNp linux-2.6.36.2/arch/arm/mach-omap1/pm.c linux-2.6.36.2/arch/arm/mach-omap1/pm.c
---- linux-2.6.36.2/arch/arm/mach-omap1/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-omap1/pm.c 2010-12-09 20:24:59.000000000 -0500
+ .read = last_radio_log_read,
+ .llseek = default_llseek,
+diff -urNp linux-2.6.37/arch/arm/mach-omap1/pm.c linux-2.6.37/arch/arm/mach-omap1/pm.c
+--- linux-2.6.37/arch/arm/mach-omap1/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap1/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -462,22 +467,22 @@
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.36.2/arch/arm/mach-omap2/pm24xx.c linux-2.6.36.2/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.36.2/arch/arm/mach-omap2/pm24xx.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-omap2/pm24xx.c 2010-12-09 20:24:57.000000000 -0500
-@@ -324,7 +324,7 @@ static void omap2_pm_finish(void)
- enable_hlt();
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm24xx.c linux-2.6.37/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm24xx.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm24xx.c 2011-01-17 02:41:00.000000000 -0500
+@@ -359,7 +359,7 @@ static void omap2_pm_end(void)
+ suspend_state = PM_SUSPEND_ON;
}
-static struct platform_suspend_ops omap_pm_ops = {
+static const struct platform_suspend_ops omap_pm_ops = {
+ .begin = omap2_pm_begin,
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
- .finish = omap2_pm_finish,
-diff -urNp linux-2.6.36.2/arch/arm/mach-omap2/pm34xx.c linux-2.6.36.2/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.36.2/arch/arm/mach-omap2/pm34xx.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-omap2/pm34xx.c 2010-12-09 20:24:56.000000000 -0500
-@@ -672,7 +672,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm34xx.c linux-2.6.37/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm34xx.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm34xx.c 2011-01-17 02:41:00.000000000 -0500
+@@ -617,7 +617,7 @@ static void omap3_pm_end(void)
return;
}
@@ -486,9 +491,9 @@
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.36.2/arch/arm/mach-omap2/pm44xx.c linux-2.6.36.2/arch/arm/mach-omap2/pm44xx.c
---- linux-2.6.36.2/arch/arm/mach-omap2/pm44xx.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-omap2/pm44xx.c 2010-12-09 20:24:57.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm44xx.c linux-2.6.37/arch/arm/mach-omap2/pm44xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm44xx.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm44xx.c 2011-01-17 02:41:00.000000000 -0500
@@ -75,7 +75,7 @@ static void omap4_pm_end(void)
return;
}
@@ -498,9 +503,9 @@
.begin = omap4_pm_begin,
.end = omap4_pm_end,
.prepare = omap4_pm_prepare,
-diff -urNp linux-2.6.36.2/arch/arm/mach-pnx4008/pm.c linux-2.6.36.2/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.36.2/arch/arm/mach-pnx4008/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-pnx4008/pm.c 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-pnx4008/pm.c linux-2.6.37/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.37/arch/arm/mach-pnx4008/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pnx4008/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -510,9 +515,9 @@
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.36.2/arch/arm/mach-pxa/pm.c linux-2.6.36.2/arch/arm/mach-pxa/pm.c
---- linux-2.6.36.2/arch/arm/mach-pxa/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-pxa/pm.c 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-pxa/pm.c linux-2.6.37/arch/arm/mach-pxa/pm.c
+--- linux-2.6.37/arch/arm/mach-pxa/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pxa/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -522,9 +527,9 @@
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.36.2/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.36.2/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.36.2/arch/arm/mach-pxa/sharpsl_pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-09 20:25:01.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status
}
@@ -534,9 +539,9 @@
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.36.2/arch/arm/mach-sa1100/pm.c linux-2.6.36.2/arch/arm/mach-sa1100/pm.c
---- linux-2.6.36.2/arch/arm/mach-sa1100/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mach-sa1100/pm.c 2010-12-09 20:25:00.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mach-sa1100/pm.c linux-2.6.37/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.37/arch/arm/mach-sa1100/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-sa1100/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -546,9 +551,9 @@
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.36.2/arch/arm/mm/fault.c linux-2.6.36.2/arch/arm/mm/fault.c
---- linux-2.6.36.2/arch/arm/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mm/fault.c 2010-12-09 20:25:00.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mm/fault.c linux-2.6.37/arch/arm/mm/fault.c
+--- linux-2.6.37/arch/arm/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -597,9 +602,9 @@
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.36.2/arch/arm/mm/mmap.c linux-2.6.36.2/arch/arm/mm/mmap.c
---- linux-2.6.36.2/arch/arm/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/mm/mmap.c 2010-12-09 20:24:59.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/mm/mmap.c linux-2.6.37/arch/arm/mm/mmap.c
+--- linux-2.6.37/arch/arm/mm/mmap.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mm/mmap.c 2011-01-17 02:41:00.000000000 -0500
@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -649,9 +654,9 @@
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-2.6.36.2/arch/arm/plat-samsung/pm.c linux-2.6.36.2/arch/arm/plat-samsung/pm.c
---- linux-2.6.36.2/arch/arm/plat-samsung/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/arm/plat-samsung/pm.c 2010-12-09 20:24:56.000000000 -0500
+diff -urNp linux-2.6.37/arch/arm/plat-samsung/pm.c linux-2.6.37/arch/arm/plat-samsung/pm.c
+--- linux-2.6.37/arch/arm/plat-samsung/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/plat-samsung/pm.c 2011-01-17 02:41:00.000000000 -0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -661,9 +666,9 @@
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.36.2/arch/avr32/include/asm/elf.h linux-2.6.36.2/arch/avr32/include/asm/elf.h
---- linux-2.6.36.2/arch/avr32/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36.2/arch/avr32/include/asm/elf.h 2010-12-09 20:25:10.000000000 -0500
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2-no-const-grsec.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec-common.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.54&r2=1.55&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.870&r2=1.871&f=u
More information about the pld-cvs-commit
mailing list