Dapper Secure Kernel Patchset 4.9.69

Author: matthewruffell

init_rebase.sh

@@ -1,5 +1,5 @@
 KERNEL_MAJOR_VERSION=4.9
-KERNEL_VERSION=4.9.68
+KERNEL_VERSION=4.9.69
 
 echo "Setting up rebase directory..."
 mkdir rebase

kernel/patch-4.9.69.xz

@@ -1,6 +1,6 @@
 DATE=`date +%Y-%m-%d`
 KERNEL_MAJOR_VERSION=4.9
-KERNEL_VERSION=4.9.68
+KERNEL_VERSION=4.9.69
 
 echo "Setting up release directory..."
 mkdir release

make_release.sh

@@ -124,7 +124,7 @@ index 1f59ea05..81245f0 100644
  #define access_ok(type, addr, size)	(__range_ok(addr, size) == 0)
 
  #define user_addr_max() \
-@@ -474,10 +506,10 @@ do {									\
+@@ -474,10 +474,10 @@ do {									\
 
 
  #ifdef CONFIG_MMU
@@ -134,7 +134,7 @@ index 1f59ea05..81245f0 100644
 
 -static inline unsigned long __must_check
 +static inline unsigned long __must_check __size_overflow(3)
- __copy_from_user(void *to, const void __user *from, unsigned long n)
+ __arch_copy_from_user(void *to, const void __user *from, unsigned long n)
  {
  	unsigned int __ua_flags;
 @@ -489,9 +521,9 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -161,24 +161,3 @@ index 1f59ea05..81245f0 100644
  __clear_user_std(void __user *addr, unsigned long n);
 
  static inline unsigned long __must_check
-@@ -534,6 +566,10 @@ __clear_user(void __user *addr, unsigned long n)
- static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
- {
- 	unsigned long res = n;
-+
-+	if ((long)n < 0)
-+		return n;
-+
- 	if (likely(access_ok(VERIFY_READ, from, n)))
- 		res = __copy_from_user(to, from, n);
- 	if (unlikely(res))
-@@ -543,6 +579,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
- 
- static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
- {
-+	if ((long)n < 0)
-+		return n;
-+
- 	if (access_ok(VERIFY_WRITE, to, n))
- 		n = __copy_to_user(to, from, n);
- 	return n;

patches/a_arch_arm_include_asm_uaccess.h.patch

@@ -91,16 +91,14 @@ index 9e42842..fad7e1d 100644
 
  	/*
  	 * Pre UV4, the gnode is required to locate the payload queue
-@@ -1846,9 +1846,9 @@ static void pq_init(int node, int pnode)
+@@ -1846,8 +1846,8 @@ static void pq_init(int node, int pnode)
  		write_mmr_payload_tail(pnode, tail);
  	}
 
 -	ops.write_payload_first(pnode, first);
 -	ops.write_payload_last(pnode, last);
--	ops.write_g_sw_ack(pnode, 0xffffUL);
 +	ops->write_payload_first(pnode, first);
 +	ops->write_payload_last(pnode, last);
-+	ops->write_g_sw_ack(pnode, 0xffffUL);
 
  	/* in effect, all msg_type's are set to MSG_NOOP */
  	memset(pqp, 0, sizeof(struct bau_pq_entry) * DEST_Q_SIZE);

patches/a_arch_x86_platform_uv_tlb_uv.c.patch

@@ -2,12 +2,12 @@ diff --git a/scripts/package/Makefile b/scripts/package/Makefile
 index 71b4a8a..dcb89c5 100644
 --- a/scripts/package/Makefile
 +++ b/scripts/package/Makefile
-@@ -40,7 +40,7 @@ if test "$(objtree)" != "$(srctree)"; then \
+@@ -39,7 +39,7 @@ if test "$(objtree)" != "$(srctree)"; then \
+ 	false; \
  fi ; \
  $(srctree)/scripts/setlocalversion --save-scmversion; \
- ln -sf $(srctree) $(2); \
 -tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \
-+tar --owner=root --group=root -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \
- 	$(addprefix $(2)/,$(TAR_CONTENT) $(3)); \
- rm -f $(2) $(objtree)/.scmversion
+++tar --owner=root --group=root -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \
+ 	--transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \
+ rm -f $(objtree)/.scmversion
 

patches/a_scripts_package_Makefile.patch

@@ -1,6 +1,6 @@
 DATE=`date +%Y-%m-%d`
 KERNEL_MAJOR_VERSION=4.9
-KERNEL_VERSION=4.9.68
+KERNEL_VERSION=4.9.69
 
 echo "Removing old kernels..."
 rm -rf test