Release linux (4.6.2-1).
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJXYbBEAAoJEAVMuPMTQ89EM8wP/3llI8Jr6Q+2ktVOqYQ7U0JT +UEzEuKlVS+3/SjFZv8dAqpM018OJDIiccgzjvuny6MSYHiH//yWG4lC8O2WikBA RhfbUsNWFImEkwhY8wD1cjuF0QIXNtR7qOKdCPX5wQUiG469WF4F4l3lgWoo01ub hYXNsGebIjZTQE6KWGm97pvSRNFPT18DulANGpe9m804y2Xs+dQn6dVHKaSYT0BF labA6C+hCmbMos3gEYNzjbmU9fxYpS98pXq7uc04ryBj3UjGoBlmxeip9yrIiC0I oZr8kAxz5PCRSqPnhZqE51WO6eLaWIrEGGTnb6sOtbHYsTrNu8iHpWXVCkB8/2GL LYhOJn3AyqJE4yb69EKSWL7cbVEqyVJHkGntGhTm+tKJP0QmnKlhQY47aViPt4Fc IXQvUOeG94GROooRTNLp9/3N2di4p4YPNv2QgM5lUJjySWUMCNzw/MjpYfvuIHrp bowSN5EYDpO6WqcZZVHogM9hJ2Aq+zWYkfK4f38r4T4+g0T8IQ8qMCY/o/LV7uod KUbQ7SIHK7uAMT9BpJuslCwvwhKdf/9y/bcuOkB2alfR52uApdDkL04uD5jIbjaL fElOyQPmJPNe0zxP6yZp4G3/JbMhWdX+qc77+GWkj27mBqnBEZKBHjCmU/6Vfv2Y VolsoZ6sfxJ1pxlUcWPt =li3O -----END PGP SIGNATURE----- Merge tag 'debian/4.6.2-1'
This commit is contained in:
Ben Hutchings
commit
a808d3112b
|
|
@ -35,6 +35,140 @@ linux (4.7~rc3-1~exp1) UNRELEASED; urgency=medium
|
|||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 07 Jun 2016 19:37:55 +0100
|
||||
|
||||
linux (4.6.2-1) unstable; urgency=medium
|
||||
|
||||
* Team upload.
|
||||
* New upstream stable update:
|
||||
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.6.2
|
||||
- f2fs: fix deadlock when flush inline data
|
||||
- [mips*] math-emu: Fix jalr emulation when rd == $0
|
||||
- [mips*] Avoid using unwind_stack() with usermode
|
||||
- [mips*] Fix siginfo.h to use strict posix types
|
||||
- [mips*] Fix uapi include in exported asm/siginfo.h
|
||||
- [mips*] Fix watchpoint restoration
|
||||
- [mips*] Flush highmem pages in __flush_dcache_page
|
||||
- [mips*] Handle highmem pages in __update_cache
|
||||
- [mips*] Sync icache & dcache in set_pte_at
|
||||
- [mips*] Reserve nosave data for hibernation
|
||||
- [mips*el/loongson-3] Reserve 32MB for RS780E integrated GPU
|
||||
- [mips*] Use copy_s.fmt rather than copy_u.fmt
|
||||
- [mips*] Prevent "restoration" of MSA context in non-MSA kernels
|
||||
- [mips*] ptrace: Fix FP context restoration FCSR regression
|
||||
- [mips*] ptrace: Prevent writes to read-only FCSR bits
|
||||
- [mips*] lib: Mark intrinsics notrace
|
||||
- [mips*] VDSO: Build with `-fno-strict-aliasing'
|
||||
- affs: fix remount failure when there are no options changed
|
||||
- ASoC: ak4642: Enable cache usage to fix crashes on resume
|
||||
- Input: uinput - handle compat ioctl for UI_SET_PHYS
|
||||
- Input: xpad - move pending clear to the correct location
|
||||
- Input: xpad - prevent spurious input from wired Xbox 360 controllers
|
||||
- [armhf] sun4i: dt: Enable dram gate 5 (tve0 clock) for simplefb TV output
|
||||
- [armhf] sun7i: dt: Enable dram gate 5 (tve0 clock) for simplefb TV output
|
||||
- [armhf] mvebu: fix GPIO config on the Linksys boards
|
||||
- [armhf] dts: exynos: Add interrupt line to MAX8997 PMIC on
|
||||
exynos4210-trats
|
||||
- ath9k: Fix LED polarity for some Mini PCI AR9220 MB92 cards.
|
||||
- ath10k: fix firmware assert in monitor mode
|
||||
- ath10k: fix rx_channel during hw reconfigure
|
||||
- ath10k: fix kernel panic, move arvifs list head init before htt init
|
||||
- ath5k: Change led pin configuration for compaq c700 laptop
|
||||
- [armhf] hwrng: exynos - Fix unbalanced PM runtime put on timeout
|
||||
error path
|
||||
- rtlwifi: Fix logic error in enter/exit power-save mode
|
||||
- rtlwifi: pci: use dev_kfree_skb_irq instead of kfree_skb in
|
||||
rtl_pci_reset_trx_ring
|
||||
- Revert "lpfc: Delete unnecessary checks before the function call
|
||||
mempool_destroy"
|
||||
- aacraid: Start adapter after updating number of MSIX vectors
|
||||
- aacraid: Relinquish CPU during timeout wait
|
||||
- aacraid: Fix for aac_command_thread hang
|
||||
- aacraid: Fix for KDUMP driver hang
|
||||
- regulator: Try to resolve regulators supplies on registration
|
||||
- hwmon: (ads7828) Enable internal reference
|
||||
- [x86] mfd: intel_quark_i2c_gpio: Remove clock tree on error path
|
||||
- [x86] mfd: intel-lpss: Save register context on suspend
|
||||
- [x86] mfd: intel_soc_pmic_core: Terminate panel control GPIO lookup
|
||||
table correctly
|
||||
- PM / Runtime: Fix error path in pm_runtime_force_resume()
|
||||
- cpuidle: Indicate when a device has been unregistered
|
||||
- cpuidle: Fix cpuidle_state_is_coupled() argument in cpuidle_enter()
|
||||
- [armhf] clk: bcm2835: Fix PLL poweron
|
||||
- [armhf] clk: bcm2835: pll_off should only update CM_PLL_ANARST
|
||||
- [armhf] clk: bcm2835: divider value has to be 1 or more
|
||||
- [armhf] clk: bcm2835: correctly enable fractional clock support
|
||||
- [armhf] pinctrl: exynos5440: Use off-stack memory for pinctrl_gpio_range
|
||||
- PCI: Disable all BAR sizing for devices with non-compliant BARs
|
||||
- media: v4l2-compat-ioctl32: fix missing reserved field copy in
|
||||
put_v4l2_create32
|
||||
- PKCS#7: fix missing break on OID_sha224 case
|
||||
- mm: use phys_addr_t for reserve_bootmem_region() arguments
|
||||
- mm/compaction.c: fix zoneindex in kcompactd()
|
||||
- wait/ptrace: assume __WALL if the child is traced
|
||||
- batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update
|
||||
- [powerpc*] book3s64: Fix branching to OOL handlers in relocatable kernel
|
||||
- [powerpc*] eeh: Don't report error in eeh_pe_reset_and_recover()
|
||||
- [powerpc*] Revert "powerpc/eeh: Fix crash in eeh_add_device_early()
|
||||
on Cell"
|
||||
- [powerpc*] eeh: Restore initial state in eeh_pe_reset_and_recover()
|
||||
- xen/events: Don't move disabled irqs
|
||||
- xen: use same main loop for counting and remapping pages
|
||||
- sunrpc: fix stripping of padded MIC tokens
|
||||
- [x86] drm/gma500: Fix possible out of bounds read
|
||||
- [x86] drm/vmwgfx: Kill some lockdep warnings
|
||||
- [x86] drm/amdgpu: use drm_mode_vrefresh() rather than mode->vrefresh
|
||||
- [x86] drm/amdgpu: Fix hdmi deep color support.
|
||||
- [x86] drm/i915/fbdev: Fix num_connector references in
|
||||
intel_fb_initial_config()
|
||||
- drm/fb_helper: Fix references to dev->mode_config.num_connector
|
||||
- [x86] drm/i915: Discard previous atomic state on resume if connectors
|
||||
change
|
||||
- drm/atomic: Verify connector->funcs != NULL when clearing states
|
||||
- Bluetooth: 6lowpan: Fix memory corruption of ipv6 destination address
|
||||
- [x86] drm/i915/psr: Try to program link training times correctly
|
||||
- [x86] drm/i915: Respect DP++ adaptor TMDS clock limit
|
||||
- [x86] drm/i915: Enable/disable TMDS output buffers in DP++ adaptor
|
||||
as needed
|
||||
- [x86] drm/i915: Don't leave old junk in ilk active watermarks on readout
|
||||
- [x86] drm/i915: Fix watermarks for VLV/CHV
|
||||
- [armhf] drm/imx: Match imx-ipuv3-crtc components using device node in
|
||||
platform data
|
||||
- [x86] drm/i915: Pass the correct crtc state to .update_plane()
|
||||
- ext4: fix data exposure after a crash
|
||||
- ext4: fix hang when processing corrupted orphaned inode list
|
||||
- ext4: clean up error handling when orphan list is corrupted
|
||||
- ext4: fix check of dqget() return value in ext4_ioctl_setproject()
|
||||
- ext4: fix oops on corrupted filesystem
|
||||
- ext4: address UBSAN warning in mb_find_order_for_block()
|
||||
- nfs: avoid race that crashes nfs_init_commit
|
||||
- PM / sleep: Handle failures in device_suspend_late() consistently
|
||||
- mm: thp: avoid false positive VM_BUG_ON_PAGE in page_move_anon_rmap()
|
||||
- xfs: disallow rw remount on fs with unknown ro-compat features
|
||||
- xfs: Don't wrap growfs AGFL indexes
|
||||
- xfs: remove xfs_fs_evict_inode()
|
||||
- xfs: xfs_iflush_cluster fails to abort on error
|
||||
- xfs: fix inode validity check in xfs_iflush_cluster
|
||||
- xfs: skip stale inodes in xfs_iflush_cluster
|
||||
- [armhf] drm: msm: remove unused variable
|
||||
- IB/hfi1: Fix hard lockup due to not using save/restore spin lock
|
||||
- regulator: Fix deadlock during regulator registration
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [armel,armhf,sh4] linux-image: Do not suggest fdutils
|
||||
* liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth
|
||||
* liblockdep: Fix 'unused value' warnings
|
||||
* liblockdep: Fix 'set but not used' warnings
|
||||
* liblockdep: Fix 'defined but not used' warning for init_utsname()
|
||||
|
||||
[ Salvatore Bonaccorso ]
|
||||
* Stack overflow via ecryptfs and /proc/$pid/environ (CVE-2016-1583)
|
||||
- proc: prevent stacking filesystems on top
|
||||
- ecryptfs: forbid opening files without mmap handler
|
||||
- sched: panic on corrupted stack end
|
||||
* tipc: fix an infoleak in tipc_nl_compat_link_dump (CVE-2016-5243)
|
||||
* rds: fix an infoleak in rds_inc_info_copy (CVE-2016-5244)
|
||||
|
||||
-- Salvatore Bonaccorso <carnil@debian.org> Wed, 15 Jun 2016 21:32:54 +0200
|
||||
|
||||
linux (4.6.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream stable update:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ kernel-arch: arm
|
|||
image-file: arch/arm/boot/zImage
|
||||
|
||||
[image]
|
||||
suggests: fdutils
|
||||
install-stem: vmlinuz
|
||||
|
||||
[relations]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ image-file: arch/arm/boot/zImage
|
|||
vdso: true
|
||||
|
||||
[image]
|
||||
suggests: fdutils
|
||||
install-stem: vmlinuz
|
||||
|
||||
[relations]
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ image-file: arch/sh/boot/zImage
|
|||
signed-modules: false
|
||||
|
||||
[image]
|
||||
suggests: fdutils
|
||||
install-stem: vmlinuz
|
||||
|
||||
[sh7751r_description]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 21:14:14 +0100
|
||||
Subject: [PATCH 3/7] liblockdep: Define the ARRAY_SIZE() macro
|
||||
Forwarded: http://mid.gmane.org/20160614204803.GV7555@decadent.org.uk
|
||||
|
||||
lockdep.c now uses ARRAY_SIZE().
|
||||
|
||||
Fixes: 75dd602a5198 ("lockdep: Fix lock_chain::base size")
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
index 276c7a8b2ed1..da87bd9ad2c1 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
@@ -7,6 +7,8 @@
|
||||
#include <linux/hardirq.h>
|
||||
#include <linux/kern_levels.h>
|
||||
|
||||
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
|
||||
+
|
||||
#ifndef container_of
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
const typeof(((type *)0)->member) * __mptr = (ptr); \
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 21:26:01 +0100
|
||||
Subject: [PATCH 4/7] liblockdep: Enable -Wall by default
|
||||
Forwarded: http://mid.gmane.org/20160614204841.GW7555@decadent.org.uk
|
||||
|
||||
Regressions in liblockdep may be missed because it doesn't enable
|
||||
warnings.
|
||||
|
||||
Adding -Wall immediately introduces a lot of warnings, but those will
|
||||
be fixed by the following commits.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
|
||||
index 1d57af56814b..710a0edfe1b1 100644
|
||||
--- a/tools/lib/lockdep/Makefile
|
||||
+++ b/tools/lib/lockdep/Makefile
|
||||
@@ -79,6 +79,7 @@ INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)
|
||||
# Set compile option CFLAGS if not set elsewhere
|
||||
CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
|
||||
CFLAGS += -fPIC
|
||||
+CFLAGS += -Wall
|
||||
|
||||
override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
|
||||
|
||||
58
debian/patches/bugfix/all/liblockdep-fix-defined-but-not-used-warning-for-init.patch
vendored
Normal file
58
debian/patches/bugfix/all/liblockdep-fix-defined-but-not-used-warning-for-init.patch
vendored
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 21:32:11 +0100
|
||||
Subject: [PATCH 7/7] liblockdep: Fix 'defined but not used' warning for
|
||||
init_utsname()
|
||||
Forwarded: http://mid.gmane.org/20160614204909.GZ7555@decadent.org.uk
|
||||
|
||||
We define init_utsname() as static but not inline, resulting
|
||||
in a warning for every source file that includes lockdep.h but
|
||||
doesn't call it.
|
||||
|
||||
Since it is only used by lockdep.c, define it in there.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/lockdep.c | 10 ++++++++++
|
||||
tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
|
||||
index a0a2e3a266af..513140ea8a58 100644
|
||||
--- a/tools/lib/lockdep/lockdep.c
|
||||
+++ b/tools/lib/lockdep/lockdep.c
|
||||
@@ -5,4 +5,14 @@
|
||||
#define hlist_add_head_rcu hlist_add_head
|
||||
#define hlist_del_rcu hlist_del
|
||||
|
||||
+static struct new_utsname *init_utsname(void)
|
||||
+{
|
||||
+ static struct new_utsname n = (struct new_utsname) {
|
||||
+ .release = "liblockdep",
|
||||
+ .version = LIBLOCKDEP_VERSION,
|
||||
+ };
|
||||
+
|
||||
+ return &n;
|
||||
+}
|
||||
+
|
||||
#include "../../../kernel/locking/lockdep.c"
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
index d1079034a14d..c157242e0417 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
@@ -44,16 +44,6 @@ static inline int debug_locks_off(void)
|
||||
#define atomic_t unsigned long
|
||||
#define atomic_inc(x) ((*(x))++)
|
||||
|
||||
-static struct new_utsname *init_utsname(void)
|
||||
-{
|
||||
- static struct new_utsname n = (struct new_utsname) {
|
||||
- .release = "liblockdep",
|
||||
- .version = LIBLOCKDEP_VERSION,
|
||||
- };
|
||||
-
|
||||
- return &n;
|
||||
-}
|
||||
-
|
||||
#define print_tainted() ""
|
||||
#define static_obj(x) 1
|
||||
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 20:13:24 +0100
|
||||
Subject: [PATCH 6/7] liblockdep: Fix 'set but not used' warnings
|
||||
Forwarded: http://mid.gmane.org/20160614204900.GY7555@decadent.org.uk
|
||||
|
||||
liblockdep defines trivial macros for working with interrupt flags, as
|
||||
interrupts are never disabled in userland. This results in warnings
|
||||
from gcc when -Wunused-but-set-variable is enabled, and it is enabled
|
||||
by -Wall. Fix this by evaluating the flags parameter and casting it to
|
||||
void.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/irqflags.h b/tools/lib/lockdep/uinclude/linux/irqflags.h
|
||||
index 6cc296f0fad0..df77669cfe1c 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/irqflags.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/irqflags.h
|
||||
@@ -17,19 +17,19 @@
|
||||
#define raw_local_irq_disable() do { } while (0)
|
||||
#define raw_local_irq_enable() do { } while (0)
|
||||
#define raw_local_irq_save(flags) ((flags) = 0)
|
||||
-#define raw_local_irq_restore(flags) do { } while (0)
|
||||
+#define raw_local_irq_restore(flags) ((void)(flags))
|
||||
#define raw_local_save_flags(flags) ((flags) = 0)
|
||||
-#define raw_irqs_disabled_flags(flags) do { } while (0)
|
||||
+#define raw_irqs_disabled_flags(flags) ((void)(flags))
|
||||
#define raw_irqs_disabled() 0
|
||||
#define raw_safe_halt()
|
||||
|
||||
#define local_irq_enable() do { } while (0)
|
||||
#define local_irq_disable() do { } while (0)
|
||||
#define local_irq_save(flags) ((flags) = 0)
|
||||
-#define local_irq_restore(flags) do { } while (0)
|
||||
+#define local_irq_restore(flags) ((void)(flags))
|
||||
#define local_save_flags(flags) ((flags) = 0)
|
||||
#define irqs_disabled() (1)
|
||||
-#define irqs_disabled_flags(flags) (0)
|
||||
+#define irqs_disabled_flags(flags) ((void)(flags), 0)
|
||||
#define safe_halt() do { } while (0)
|
||||
|
||||
#define trace_lock_release(x, y)
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 21:09:19 +0100
|
||||
Subject: [PATCH 1/7] liblockdep: Fix undefined symbol prandom_u32
|
||||
Forwarded: http://mid.gmane.org/20160614204713.GT7555@decadent.org.uk
|
||||
|
||||
__lock_pin_lock() now calls prandom_u32() which is not defined in
|
||||
liblockdep. __lock_pin_lock() and its caller lock_pin_lock() are dead
|
||||
code in liblockdep, but we still need to provide a definition of
|
||||
prandom_u32() in case lazy binding is disabled.
|
||||
|
||||
Fixes: e7904a28f533 ("locking/lockdep, sched/core: Implement a better ...")
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/common.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/tools/lib/lockdep/common.c b/tools/lib/lockdep/common.c
|
||||
index d1c89cc06f5f..405c17667c4d 100644
|
||||
--- a/tools/lib/lockdep/common.c
|
||||
+++ b/tools/lib/lockdep/common.c
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
+#include <stdlib.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/lockdep.h>
|
||||
#include <unistd.h>
|
||||
@@ -10,6 +11,11 @@ static __thread struct task_struct current_obj;
|
||||
/* lockdep wants these */
|
||||
bool debug_locks = true;
|
||||
bool debug_locks_silent;
|
||||
+u32 prandom_u32(void)
|
||||
+{
|
||||
+ /* Used only by lock_pin_lock() which is dead code */
|
||||
+ abort();
|
||||
+}
|
||||
|
||||
__attribute__((destructor)) static void liblockdep_exit(void)
|
||||
{
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 20:13:23 +0100
|
||||
Subject: [PATCH 5/7] liblockdep: Fix 'unused value' warnings
|
||||
Forwarded: http://mid.gmane.org/20160614204853.GX7555@decadent.org.uk
|
||||
|
||||
liblockdep defines various macros that may expand to an expression
|
||||
with no effect, while the in-kernel definition does have an effect.
|
||||
This results in warnings from gcc when -Wunused-value is enabled, and
|
||||
is is enabled by -Wall. Fix this by introducing trivial functions,
|
||||
as function return values are generally allowed to be ignored.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
|
||||
tools/lib/lockdep/uinclude/linux/kernel.h | 12 +++++++++---
|
||||
tools/lib/lockdep/uinclude/linux/lockdep.h | 6 +++++-
|
||||
3 files changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/lib/lockdep/uinclude/linux/debug_locks.h
|
||||
index f38eb64df794..1d4fbec5c649 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/debug_locks.h
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <stddef.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
-#define DEBUG_LOCKS_WARN_ON(x) (x)
|
||||
+#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
|
||||
|
||||
extern bool debug_locks;
|
||||
extern bool debug_locks_silent;
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
index da87bd9ad2c1..021cff4f4e3d 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
@@ -22,10 +22,16 @@
|
||||
_max1 > _max2 ? _max1 : _max2; })
|
||||
|
||||
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
|
||||
-#define WARN_ON(x) (x)
|
||||
-#define WARN_ON_ONCE(x) (x)
|
||||
+
|
||||
+static inline int lockdep_warn(int condition)
|
||||
+{
|
||||
+ return condition;
|
||||
+}
|
||||
+#define WARN_ON(x) lockdep_warn(x)
|
||||
+#define WARN_ON_ONCE(x) WARN_ON(x)
|
||||
+#define WARN(x, y...) WARN_ON(x)
|
||||
+
|
||||
#define likely(x) (x)
|
||||
-#define WARN(x, y...) (x)
|
||||
#define uninitialized_var(x) x
|
||||
#define __init
|
||||
#define noinline
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
index d30214221920..d1079034a14d 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
@@ -29,7 +29,11 @@ extern struct task_struct *__curr(void);
|
||||
|
||||
#define current (__curr())
|
||||
|
||||
-#define debug_locks_off() 1
|
||||
+static inline int debug_locks_off(void)
|
||||
+{
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
#define task_pid_nr(tsk) ((tsk)->pid)
|
||||
|
||||
#define KSYM_NAME_LEN 128
|
||||
44
debian/patches/bugfix/all/liblockdep-reduce-max_lock_depth-to-avoid-overflowin.patch
vendored
Normal file
44
debian/patches/bugfix/all/liblockdep-reduce-max_lock_depth-to-avoid-overflowin.patch
vendored
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 14 Jun 2016 20:44:14 +0100
|
||||
Subject: [PATCH 2/7] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing
|
||||
lock_chain::depth
|
||||
Forwarded: http://mid.gmane.org/20160614204752.GU7555@decadent.org.uk
|
||||
|
||||
liblockdep has been broken since commit 75dd602a5198 ("lockdep: Fix
|
||||
lock_chain::base size"), as that adds a check that MAX_LOCK_DEPTH is
|
||||
within the range of lock_chain::depth and in liblockdep it is much
|
||||
too large.
|
||||
|
||||
That should have resulted in a compiler error, but didn't because:
|
||||
|
||||
- the check uses ARRAY_SIZE(), which isn't yet defined in liblockdep
|
||||
so is assumed to be an (undeclared) function
|
||||
- putting a function call inside a BUILD_BUG_ON() expression quietly
|
||||
turns it into some nonsense involving a variable-length array
|
||||
|
||||
It did produce a compiler warning, but I didn't notice because
|
||||
liblockdep already produces too many warnings if -Wall is enabled
|
||||
(which I'll fix shortly).
|
||||
|
||||
Even before that commit, which reduced lock_chain::depth from 8 bits
|
||||
to 6, MAX_LOCK_DEPTH was too large.
|
||||
|
||||
Cc: <stable@vger.kernel.org> # for versions before 4.6, use a value of 255
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
tools/lib/lockdep/uinclude/linux/lockdep.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
index c808c7d02d21..d30214221920 100644
|
||||
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <linux/utsname.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
-#define MAX_LOCK_DEPTH 2000UL
|
||||
+#define MAX_LOCK_DEPTH 63UL
|
||||
|
||||
#define asmlinkage
|
||||
#define __visible
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Thu, 18 Feb 2016 03:34:25 +0000
|
||||
Subject: lockdep: Add missing macros
|
||||
Forwarded: no
|
||||
|
||||
liblockdep is broken again due to lockdep using kernel macros that it
|
||||
doesn't have substitutes for.
|
||||
---
|
||||
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <linux/rcu.h>
|
||||
#include <linux/hardirq.h>
|
||||
#include <linux/kern_levels.h>
|
||||
+#include <linux/compiler.h>
|
||||
|
||||
#ifndef container_of
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
--- a/tools/lib/lockdep/uinclude/linux/list.h
|
||||
+++ b/tools/lib/lockdep/uinclude/linux/list.h
|
||||
@@ -1,1 +1,4 @@
|
||||
#include "../../../include/linux/list.h"
|
||||
+#define hlist_add_head_rcu hlist_add_head
|
||||
+#define hlist_del_rcu hlist_del
|
||||
+#define hlist_for_each_entry_rcu hlist_for_each_entry
|
||||
|
|
@ -108,8 +108,14 @@ bugfix/x86/tools-hv-fix-fortify-format-warning.patch
|
|||
bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
|
||||
bugfix/alpha/alpha-uapi-add-support-for-__sane_userspace_types__.patch
|
||||
bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch
|
||||
bugfix/all/lockdep-add-missing-macros.patch
|
||||
bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
|
||||
bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
|
||||
bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch
|
||||
bugfix/all/cpupower-bump-soname-version.patch
|
||||
bugfix/all/liblockdep-fix-undefined-symbol-prandom_u32.patch
|
||||
bugfix/all/liblockdep-reduce-max_lock_depth-to-avoid-overflowin.patch
|
||||
bugfix/all/liblockdep-define-the-array_size-macro.patch
|
||||
bugfix/all/liblockdep-enable-wall-by-default.patch
|
||||
bugfix/all/liblockdep-fix-unused-value-warnings.patch
|
||||
bugfix/all/liblockdep-fix-set-but-not-used-warnings.patch
|
||||
bugfix/all/liblockdep-fix-defined-but-not-used-warning-for-init.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue