Merge pull request #1 from lattice0/patching

Patching
lattice0 · Jan 15, 2024 · 9799579 · 9799579
2 parents d9909e2 + 1bcc2c5
commit 9799579
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 0 deletions.
diff --git a/devices/poco_m3/kernel/kernel_patch.sh b/devices/poco_m3/kernel/kernel_patch.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd $SCRIPT_DIR/k
+#patch -p1 < ../patches/genheaders.patch
+#patch -p1 < ../patches/security_five.patch
diff --git a/devices/poco_m3/patches/genheaders.patch b/devices/poco_m3/patches/genheaders.patch
@@ -0,0 +1,43 @@
+---
+ scripts/selinux/genheaders/genheaders.c | 1 -
+ scripts/selinux/mdp/mdp.c               | 1 -
+ security/selinux/include/classmap.h     | 1 +
+ 3 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
+index 1ceedea847dd..544ca126a8a8 100644
+--- a/scripts/selinux/genheaders/genheaders.c
++++ b/scripts/selinux/genheaders/genheaders.c
+@@ -9,7 +9,6 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
+-#include <sys/socket.h>
+
+ struct security_class_mapping {
+ 	const char *name;
+diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
+index 073fe7537f6c..6d51b74bc679 100644
+--- a/scripts/selinux/mdp/mdp.c
++++ b/scripts/selinux/mdp/mdp.c
+@@ -32,7 +32,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <sys/socket.h>
+
+ static void usage(char *name)
+ {
+diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
+index bd5fe0d3204a..201f7e588a29 100644
+--- a/security/selinux/include/classmap.h
++++ b/security/selinux/include/classmap.h
+@@ -1,5 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+ #include <linux/capability.h>
++#include <linux/socket.h>
+
+ #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
+     "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"
+-- 
+
diff --git a/devices/virtual/.gitignore b/devices/virtual/.gitignore
@@ -3,6 +3,8 @@ kernel/*
 !kernel/kernel_build.sh
 !kernel/kernel_download.sh
 !kernel/kernel_extract.sh
+!kernel/kernel_patch.sh
+
 rom/*
 !rom/rom_download.sh
 aosp/*

diff --git a/devices/virtual/kernel/kernel_patch.sh b/devices/virtual/kernel/kernel_patch.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd $SCRIPT_DIR/k
+#patch -p1 < ../patches/genheaders.patch
+#patch -p1 < ../patches/security_five.patch
diff --git a/devices/virtual/patches/genheaders.patch b/devices/virtual/patches/genheaders.patch
@@ -0,0 +1,43 @@
+---
+ scripts/selinux/genheaders/genheaders.c | 1 -
+ scripts/selinux/mdp/mdp.c               | 1 -
+ security/selinux/include/classmap.h     | 1 +
+ 3 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
+index 1ceedea847dd..544ca126a8a8 100644
+--- a/scripts/selinux/genheaders/genheaders.c
++++ b/scripts/selinux/genheaders/genheaders.c
+@@ -9,7 +9,6 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
+-#include <sys/socket.h>
+
+ struct security_class_mapping {
+ 	const char *name;
+diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
+index 073fe7537f6c..6d51b74bc679 100644
+--- a/scripts/selinux/mdp/mdp.c
++++ b/scripts/selinux/mdp/mdp.c
+@@ -32,7 +32,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <sys/socket.h>
+
+ static void usage(char *name)
+ {
+diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
+index bd5fe0d3204a..201f7e588a29 100644
+--- a/security/selinux/include/classmap.h
++++ b/security/selinux/include/classmap.h
+@@ -1,5 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+ #include <linux/capability.h>
++#include <linux/socket.h>
+
+ #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
+     "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"
+-- 
+
diff --git a/source_me.sh b/source_me.sh
@@ -27,6 +27,12 @@ function ke() {
     (cd $SCRIPT_DIR/devices/$DEVICE/kernel; ./kernel_extract.sh)
 }
 
+# Kernel Patch
+function kp() {
+    fail_if_no_device
+    (cd $SCRIPT_DIR/devices/$DEVICE/kernel; ./kernel_patch.sh)
+}
+
 # Kernel Build
 function kb() {
     fail_if_no_device
@@ -255,6 +261,7 @@ Commands:
  kd                      downloads the kernel
  ke                      extracts the kernel
  kb                      builds the kernel
+ kp                      applies patches to the kernel
  rd                      rom download
  re                      rom extrack
  be                      boot.img (from ROM) extract