diff --git a/Makefile b/Makefile index 98e90ae..e3e5d45 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -KERNEL_VERSION := 4.9.25 +KERNEL_VERSION := 4.9.27 BUSYBOX_VERSION := 1.26.2 OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img diff --git a/README.md b/README.md index a2b9e10..43a5724 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It's inspired by the following projects. ## Features -- Built with Buildroot 2017.05 with Linux kernel v4.9.25 and glibc. +- Built with Buildroot 2017.05 with Linux kernel v4.9.27 and glibc. - Strip down the Linux kernel modules and drivers - Busybox + the following utilities from Buildroot - sudo, bash, wget, xz, sntp, logrotate diff --git a/configs/buildroot.config b/configs/buildroot.config index e89c055..3b0fd76 100644 --- a/configs/buildroot.config +++ b/configs/buildroot.config @@ -352,8 +352,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.25" -BR2_LINUX_KERNEL_VERSION="4.9.25" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.27" +BR2_LINUX_KERNEL_VERSION="4.9.27" BR2_LINUX_KERNEL_PATCH="/build/patches/linux" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set diff --git a/configs/kernel.config b/configs/kernel.config index 33be31e..9d94c3e 100644 --- a/configs/kernel.config +++ b/configs/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.25 Kernel Configuration +# Linux/x86_64 4.9.27 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/patches/linux/9p-fix-a-potential-acl-leak.patch b/patches/linux/9p-fix-a-potential-acl-leak.patch new file mode 100644 index 0000000..a0e4aca --- /dev/null +++ b/patches/linux/9p-fix-a-potential-acl-leak.patch @@ -0,0 +1,48 @@ +From b5c66bab72a6a65edb15beb60b90d3cb84c5763b Mon Sep 17 00:00:00 2001 +From: Cong Wang +Date: Wed, 22 Feb 2017 15:40:53 -0800 +Subject: 9p: fix a potential acl leak + +From: Cong Wang + +commit b5c66bab72a6a65edb15beb60b90d3cb84c5763b upstream. + +posix_acl_update_mode() could possibly clear 'acl', if so we leak the +memory pointed by 'acl'. Save this pointer before calling +posix_acl_update_mode() and release the memory if 'acl' really gets +cleared. + +Link: http://lkml.kernel.org/r/1486678332-2430-1-git-send-email-xiyou.wangcong@gmail.com +Signed-off-by: Cong Wang +Reported-by: Mark Salyzyn +Reviewed-by: Jan Kara +Reviewed-by: Greg Kurz +Cc: Eric Van Hensbergen +Cc: Ron Minnich +Cc: Latchesar Ionkov +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/9p/acl.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/9p/acl.c ++++ b/fs/9p/acl.c +@@ -277,6 +277,7 @@ static int v9fs_xattr_set_acl(const stru + case ACL_TYPE_ACCESS: + if (acl) { + struct iattr iattr; ++ struct posix_acl *old_acl = acl; + + retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl); + if (retval) +@@ -287,6 +288,7 @@ static int v9fs_xattr_set_acl(const stru + * by the mode bits. So don't + * update ACL. + */ ++ posix_acl_release(old_acl); + value = NULL; + size = 0; + } diff --git a/patches/linux/revert-mmc-sdhci-msm-enable-few-quirks.patch b/patches/linux/revert-mmc-sdhci-msm-enable-few-quirks.patch deleted file mode 100644 index a3fdd0f..0000000 --- a/patches/linux/revert-mmc-sdhci-msm-enable-few-quirks.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4e9ebf72bbfdce0940237d150d2d332a83bf87d3 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Thu, 27 Apr 2017 12:37:20 +0200 -Subject: [PATCH] Revert "mmc: sdhci-msm: Enable few quirks" - -This reverts commit d84be51d1c1d3fa148a3abdeeb1455690df59e63 which is -commit a0e3142869d29688de6f77be31aa7a401a4a88f1 upstream. - -It causes problems and would need other patches backported to resolve -it, and it shouldn't have been applied to 4.9-stable. - -Reported-by: Georgi Djakov -Cc: Sahitya Tummala -Cc: Ritesh Harjani -Cc: Adrian Hunter -Cc: Ulf Hansson -Cc: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/mmc/host/sdhci-msm.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/drivers/mmc/host/sdhci-msm.c -+++ b/drivers/mmc/host/sdhci-msm.c -@@ -524,9 +524,7 @@ static const struct sdhci_ops sdhci_msm_ - static const struct sdhci_pltfm_data sdhci_msm_pdata = { - .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | - SDHCI_QUIRK_NO_CARD_NO_RESET | -- SDHCI_QUIRK_SINGLE_POWER_WRITE | -- SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, -- .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, -+ SDHCI_QUIRK_SINGLE_POWER_WRITE, - .ops = &sdhci_msm_ops, - }; -