From 9691b89fd8a0014b7d57c9fc35cf75bfe8da1577 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 3 Nov 2017 15:29:15 -0400 Subject: Rework Linux Kernel fragment applications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - All kernel recipes must inherit linux-agl.inc - All kernel recipes for a given version (e.g. 4.9) should include linux-VER-agl.inc in order to avoid duplication (such as the SMACK label patch or security fixes) - We enforce having merge_config.sh be invoked at the end, in order to make sure fragments will be applied. - Add a new fragment for Raspberry Pi to ensure the Pi Touchscreen is still enabled. With all of the above, we fix a number of minor issues as well, such as platforms manually enabling NBD/RAMDISK for netboot as the previous logic was not working in all cases. Bug-AGL: SPEC-946 Change-Id: Ic688e899df5861d83712af12d8e1c6c3c9643300 Signed-off-by: Tom Rini Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12063 Tested-by: Jenkins Job builder account Reviewed-by: José Bollo Reviewed-by: Jan-Simon Moeller --- ...n-smack_known_web-label-for-kernel-thread.patch | 49 ---------------------- .../recipes-kernel/linux/files/ath9k_htc.cfg | 4 -- .../meta-ti/recipes-kernel/linux/files/btusb.cfg | 6 --- .../recipes-kernel/linux/files/ramblock_nbd.cfg | 2 - .../meta-ti/recipes-kernel/linux/files/rtl_sdr.cfg | 5 --- 5 files changed, 66 deletions(-) delete mode 100644 meta-agl-bsp/meta-ti/recipes-kernel/linux/files/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch delete mode 100644 meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ath9k_htc.cfg delete mode 100644 meta-agl-bsp/meta-ti/recipes-kernel/linux/files/btusb.cfg delete mode 100644 meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ramblock_nbd.cfg delete mode 100644 meta-agl-bsp/meta-ti/recipes-kernel/linux/files/rtl_sdr.cfg (limited to 'meta-agl-bsp/meta-ti/recipes-kernel/linux/files') diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch deleted file mode 100644 index a1eeac3d7..000000000 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c8bbb0f916de54610513e376070aea531af19dd6 Mon Sep 17 00:00:00 2001 -From: jooseong lee -Date: Thu, 3 Nov 2016 10:55:43 +0100 -Subject: [PATCH 4/4] Smack: Assign smack_known_web label for kernel thread's -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Assign smack_known_web label for kernel thread's socket in the sk_alloc_security hook - -Creating struct sock by sk_alloc function in various kernel subsystems -like bluetooth dosen't call smack_socket_post_create(). In such case, -received sock label is the floor('_') label and makes access deny. - -Refers-to: https://review.tizen.org/gerrit/#/c/80717/4 - -Change-Id: I2e5c9359bfede84a988fd4d4d74cdb9dfdfc52d8 -Signed-off-by: jooseong lee -Signed-off-by: José Bollo ---- - security/smack/smack_lsm.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c -index cf8a93f..21651bc 100644 ---- a/security/smack/smack_lsm.c -+++ b/security/smack/smack_lsm.c -@@ -2321,8 +2321,16 @@ static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags) - if (ssp == NULL) - return -ENOMEM; - -- ssp->smk_in = skp; -- ssp->smk_out = skp; -+ /* -+ * Sockets created by kernel threads receive web label. -+ */ -+ if (unlikely(current->flags & PF_KTHREAD)) { -+ ssp->smk_in = &smack_known_web; -+ ssp->smk_out = &smack_known_web; -+ } else { -+ ssp->smk_in = skp; -+ ssp->smk_out = skp; -+ } - ssp->smk_packet = NULL; - - sk->sk_security = ssp; --- -2.7.4 - diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ath9k_htc.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ath9k_htc.cfg deleted file mode 100644 index 6f7d49880..000000000 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ath9k_htc.cfg +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_ATH_CARDS=m -CONFIG_ATH9K_HTC=m diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/btusb.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/btusb.cfg deleted file mode 100644 index 5f18d8223..000000000 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/btusb.cfg +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ramblock_nbd.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ramblock_nbd.cfg deleted file mode 100644 index ef498669d..000000000 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/ramblock_nbd.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_NBD=y diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/rtl_sdr.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/rtl_sdr.cfg deleted file mode 100644 index df5a871ef..000000000 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/rtl_sdr.cfg +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_I2C_MUX=y -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_RTL28XXU=m -- cgit 1.2.3-korg