Skip to content

Commit

Permalink
Upgrade kernel to v4.9.27 with a patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ailispaw committed May 12, 2017
1 parent bc43eb6 commit 97e3e98
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/buildroot.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel.config
Original file line number Diff line number Diff line change
@@ -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
Expand Down
48 changes: 48 additions & 0 deletions patches/linux/9p-fix-a-potential-acl-leak.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From b5c66bab72a6a65edb15beb60b90d3cb84c5763b Mon Sep 17 00:00:00 2001
From: Cong Wang <[email protected]>
Date: Wed, 22 Feb 2017 15:40:53 -0800
Subject: 9p: fix a potential acl leak

From: Cong Wang <[email protected]>

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/[email protected]
Signed-off-by: Cong Wang <[email protected]>
Reported-by: Mark Salyzyn <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Reviewed-by: Greg Kurz <[email protected]>
Cc: Eric Van Hensbergen <[email protected]>
Cc: Ron Minnich <[email protected]>
Cc: Latchesar Ionkov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
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;
}
35 changes: 0 additions & 35 deletions patches/linux/revert-mmc-sdhci-msm-enable-few-quirks.patch

This file was deleted.

0 comments on commit 97e3e98

Please sign in to comment.