diff --git a/0001-4.4-revert-btrfs.patch b/0001-4.4-revert-btrfs.patch new file mode 100644 index 0000000..4b56e24 --- /dev/null +++ b/0001-4.4-revert-btrfs.patch @@ -0,0 +1,78 @@ +From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Mon, 25 Jan 2016 11:02:06 +0100 +Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()" + +This reverts commit 696249132158014d594896df3a81390616069c5c. The +cleaner thread can block freezing when there's a snapshot cleaning in +progress and the other threads get suspended first. From the logs +provided by Martin we're waiting for reading extent pages: + +kernel: PM: Syncing filesystems ... done. +kernel: Freezing user space processes ... (elapsed 0.015 seconds) done. +kernel: Freezing remaining freezable tasks ... +kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0): +kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000 +kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff +kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451 +kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020 +kernel: Call Trace: +kernel: [] ? bit_wait+0x2c/0x2c +kernel: [] ? schedule+0x6f/0x7c +kernel: [] ? schedule_timeout+0x2f/0xd8 +kernel: [] ? timekeeping_get_ns+0xa/0x2e +kernel: [] ? ktime_get+0x36/0x44 +kernel: [] ? io_schedule_timeout+0x94/0xf2 +kernel: [] ? io_schedule_timeout+0x94/0xf2 +kernel: [] ? bit_wait_io+0x2c/0x30 +kernel: [] ? __wait_on_bit+0x41/0x73 +kernel: [] ? wait_on_page_bit+0x6d/0x72 +kernel: [] ? autoremove_wake_function+0x2a/0x2a +kernel: [] ? read_extent_buffer_pages+0x1bd/0x203 +kernel: [] ? free_root_pointers+0x4c/0x4c +kernel: [] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9 +kernel: [] ? read_tree_block+0x2d/0x45 +kernel: [] ? read_block_for_search.isra.34+0x22a/0x26b +kernel: [] ? btrfs_set_path_blocking+0x1e/0x4a +kernel: [] ? btrfs_search_slot+0x648/0x736 +kernel: [] ? btrfs_lookup_extent_info+0xb7/0x2c7 +kernel: [] ? walk_down_proc+0x9c/0x1ae +kernel: [] ? walk_down_tree+0x40/0xa4 +kernel: [] ? btrfs_drop_snapshot+0x2da/0x664 +kernel: [] ? finish_task_switch+0x126/0x167 +kernel: [] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0 +kernel: [] ? cleaner_kthread+0x13e/0x17b +kernel: [] ? btrfs_item_end+0x33/0x33 +kernel: [] ? kthread+0x95/0x9d +kernel: [] ? kthread_parkme+0x16/0x16 +kernel: [] ? ret_from_fork+0x3f/0x70 +kernel: [] ? kthread_parkme+0x16/0x16 + +As this affects a released kernel (4.4) we need a minimal fix for +stable kernels. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361 +Reported-by: Martin Ziegler +CC: stable@vger.kernel.org # 4.4 +CC: Jiri Kosina +Signed-off-by: David Sterba +Signed-off-by: Chris Mason +--- + fs/btrfs/disk-io.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +index 26ef141..404e894 100644 +--- a/fs/btrfs/disk-io.c ++++ b/fs/btrfs/disk-io.c +@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg) + int again; + struct btrfs_trans_handle *trans; + +- set_freezable(); + do { + again = 0; + +-- +cgit v0.12 + diff --git a/0001-4.4-revert-xfs.patch b/0001-4.4-revert-xfs.patch new file mode 100644 index 0000000..93eb192 --- /dev/null +++ b/0001-4.4-revert-xfs.patch @@ -0,0 +1,39 @@ +From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001 +From: Dave Chinner +Date: Tue, 19 Jan 2016 08:21:46 +1100 +Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" + +This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it +prevents machines from suspending. This regression occurs when the +xfsaild is idle on entry to suspend, and so there s no activity to +wake it from it's idle sleep and hence see that it is supposed to +freeze. Hence the freezer times out waiting for it and suspend is +cancelled. + +There is no obvious fix for this short of freezing the filesystem +properly, so revert this change for now. + +cc: # 4.4 +Signed-off-by: Dave Chinner +Acked-by: Jiri Kosina +Reviewed-by: Brian Foster +Signed-off-by: Dave Chinner +--- + fs/xfs/xfs_trans_ail.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c +index aa67339..4f18fd9 100644 +--- a/fs/xfs/xfs_trans_ail.c ++++ b/fs/xfs/xfs_trans_ail.c +@@ -497,7 +497,6 @@ xfsaild( + long tout = 0; /* milliseconds */ + + current->flags |= PF_MEMALLOC; +- set_freezable(); + + while (!kthread_should_stop()) { + if (tout && tout <= 20) +-- +cgit v0.12 + diff --git a/CVE-2016-0728.patch b/CVE-2016-0728.patch deleted file mode 100644 index e915d82..0000000 --- a/CVE-2016-0728.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 -From: Yevgeny Pats -Date: Tue, 19 Jan 2016 22:09:04 +0000 -Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring() - -This fixes CVE-2016-0728. - -If a thread is asked to join as a session keyring the keyring that's already -set as its session, we leak a keyring reference. - -This can be tested with the following program: - - #include - #include - #include - #include - - int main(int argc, const char *argv[]) - { - int i = 0; - key_serial_t serial; - - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - - if (keyctl(KEYCTL_SETPERM, serial, - KEY_POS_ALL | KEY_USR_ALL) < 0) { - perror("keyctl"); - return -1; - } - - for (i = 0; i < 100; i++) { - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - } - - return 0; - } - -If, after the program has run, there something like the following line in -/proc/keys: - -3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty - -with a usage count of 100 * the number of times the program has been run, -then the kernel is malfunctioning. If leaked-keyring has zero usages or -has been garbage collected, then the problem is fixed. - -Reported-by: Yevgeny Pats -Signed-off-by: David Howells -Acked-by: Don Zickus -Acked-by: Prarit Bhargava -Acked-by: Jarod Wilson -Signed-off-by: James Morris ---- - security/keys/process_keys.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c -index a3f85d2a..e6d50172 100644 ---- a/security/keys/process_keys.c -+++ b/security/keys/process_keys.c -@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) - ret = PTR_ERR(keyring); - goto error2; - } else if (keyring == new->session_keyring) { -+ key_put(keyring); - ret = 0; - goto error2; - } diff --git a/PKGBUILD b/PKGBUILD index 8b5eef1..7add98d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,7 +21,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'linux.preset' 'change-default-console-loglevel.patch' '0001-sdhci-revert.patch' - 'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch') + 'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch' + '0001-4.4-revert-btrfs.patch' + '0001-4.4-revert-xfs.patch') sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' @@ -32,7 +34,9 @@ sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' - 'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d') + 'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d' + '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958' + 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -58,6 +62,10 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=110751 patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch" + # #47757 fix broken suspend from btrfs and xfs + patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch" + patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)