Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-15 14:51:45 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-15 14:51:45 +0100
commit51d2bb6b29d69156237debda83812afe4ded37fa (patch)
treea0f45e9997ee0ff7fdec41820c641936d29ba767
parentbb624be57d6e9e4ac24ca332803cc152a0c2d2c0 (diff)
parent9d51899d1a29efea8279eebaced20687d24a4599 (diff)
Merge branch 'users/pmladek/SLE15/for-next' into SLE15
Pull lockdep and kdb fixes from Petr Mladek
-rw-r--r--patches.fixes/kdb-use-memmove-instead-of-overlapping-memcpy.patch47
-rw-r--r--patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch66
-rw-r--r--series.conf2
3 files changed, 115 insertions, 0 deletions
diff --git a/patches.fixes/kdb-use-memmove-instead-of-overlapping-memcpy.patch b/patches.fixes/kdb-use-memmove-instead-of-overlapping-memcpy.patch
new file mode 100644
index 0000000000..80aed5e071
--- /dev/null
+++ b/patches.fixes/kdb-use-memmove-instead-of-overlapping-memcpy.patch
@@ -0,0 +1,47 @@
+From 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 2 Feb 2018 15:59:40 +0100
+Subject: [PATCH] kdb: use memmove instead of overlapping memcpy
+Git-commit: 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add
+Patch-mainline: v4.17-rc1
+References: bsc#1120954
+
+gcc discovered that the memcpy() arguments in kdbnearsym() overlap, so
+we should really use memmove(), which is defined to handle that correctly:
+
+In function 'memcpy',
+ inlined from 'kdbnearsym' at /git/arm-soc/kernel/debug/kdb/kdb_support.c:132:4:
+/git/arm-soc/include/linux/string.h:353:9: error: '__builtin_memcpy' accessing 792 bytes at offsets 0 and 8 overlaps 784 bytes at offset 8 [-Werror=restrict]
+ return __builtin_memcpy(p, q, size);
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+Acked-by: Petr Mladek <pmladek@suse.com>
+
+---
+ kernel/debug/kdb/kdb_support.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kernel/debug/kdb/kdb_support.c b/kernel/debug/kdb/kdb_support.c
+index d35cc2d3a4cc..990b3cc526c8 100644
+--- a/kernel/debug/kdb/kdb_support.c
++++ b/kernel/debug/kdb/kdb_support.c
+@@ -129,13 +129,13 @@ int kdbnearsym(unsigned long addr, kdb_symtab_t *symtab)
+ }
+ if (i >= ARRAY_SIZE(kdb_name_table)) {
+ debug_kfree(kdb_name_table[0]);
+- memcpy(kdb_name_table, kdb_name_table+1,
++ memmove(kdb_name_table, kdb_name_table+1,
+ sizeof(kdb_name_table[0]) *
+ (ARRAY_SIZE(kdb_name_table)-1));
+ } else {
+ debug_kfree(knt1);
+ knt1 = kdb_name_table[i];
+- memcpy(kdb_name_table+i, kdb_name_table+i+1,
++ memmove(kdb_name_table+i, kdb_name_table+i+1,
+ sizeof(kdb_name_table[0]) *
+ (ARRAY_SIZE(kdb_name_table)-i-1));
+ }
+--
+2.13.7
+
diff --git a/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch b/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
new file mode 100644
index 0000000000..27ee980353
--- /dev/null
+++ b/patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
@@ -0,0 +1,66 @@
+From 7f3c7952d111ac93573fb86f4d5aeff527a07fcc Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Thu, 6 Dec 2018 17:11:29 -0800
+Subject: [PATCH] tools/lib/lockdep: Rename "trywlock" into "trywrlock"
+Git-commit: 7f3c7952d111ac93573fb86f4d5aeff527a07fcc
+Patch-mainline: v5.0-rc1
+References: bsc#1121973
+
+This patch avoids that the following compiler warning is reported while
+compiling the lockdep unit tests:
+
+Include/liblockdep/rwlock.h: In function 'liblockdep_pthread_rwlock_trywlock':
+include/liblockdep/rwlock.h:66:9: warning: implicit declaration of function 'pthread_rwlock_trywlock'; did you mean 'pthread_rwlock_trywrlock'? [-Wimplicit-function-declaration]
+ return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
+ ^~~~~~~~~~~~~~~~~~~~~~~
+ pthread_rwlock_trywrlock
+
+Signed-off-by: Bart Van Assche <bvanassche@acm.org>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Johannes Berg <johannes@sipsolutions.net>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sasha Levin <sasha.levin@oracle.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Waiman Long <longman@redhat.com>
+Cc: johannes.berg@intel.com
+Cc: tj@kernel.org
+Fixes: 5a52c9b480e0 ("liblockdep: Add public headers for pthread_rwlock_t implementation")
+Link: https://lkml.kernel.org/r/20181207011148.251812-6-bvanassche@acm.org
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Acked-by: Petr Mladek <pmladek@suse.com>
+
+---
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/lib/lockdep/include/liblockdep/rwlock.h b/tools/lib/lockdep/include/liblockdep/rwlock.h
+index a96c3bf0fef1..365762e3a1ea 100644
+--- a/tools/lib/lockdep/include/liblockdep/rwlock.h
++++ b/tools/lib/lockdep/include/liblockdep/rwlock.h
+@@ -60,10 +60,10 @@ static inline int liblockdep_pthread_rwlock_tryrdlock(liblockdep_pthread_rwlock_
+ return pthread_rwlock_tryrdlock(&lock->rwlock) == 0 ? 1 : 0;
+ }
+
+-static inline int liblockdep_pthread_rwlock_trywlock(liblockdep_pthread_rwlock_t *lock)
++static inline int liblockdep_pthread_rwlock_trywrlock(liblockdep_pthread_rwlock_t *lock)
+ {
+ lock_acquire(&lock->dep_map, 0, 1, 0, 1, NULL, (unsigned long)_RET_IP_);
+- return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
++ return pthread_rwlock_trywrlock(&lock->rwlock) == 0 ? 1 : 0;
+ }
+
+ static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
+@@ -79,7 +79,7 @@ static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock)
+ #define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock
+ #define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock
+ #define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock
+-#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock
++#define pthread_rwlock_trywrlock liblockdep_pthread_rwlock_trywrlock
+ #define pthread_rwlock_destroy liblockdep_rwlock_destroy
+
+ #endif
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index fb3f8225f1..f83381b739 100644
--- a/series.conf
+++ b/series.conf
@@ -15324,6 +15324,7 @@
patches.drivers/iommu-amd-take-into-account-that-alloc_dev_data-may-return-null
patches.drivers/iommu-vt-d-fix-a-potential-memory-leak
patches.drivers/0016-ACPI-IORT-Add-msi-address-regions-reservation-helper.patch
+ patches.fixes/kdb-use-memmove-instead-of-overlapping-memcpy.patch
patches.drivers/mmc-jz4740-Fix-race-condition-in-IRQ-mask-update
patches.fixes/xen-xenbus_dev_frontend-fix-XS_TRANSACTION_END-handling.patch
patches.arch/x86-xen-delay-get_cpu_cap-until-stack-canary-is-established
@@ -19613,6 +19614,7 @@
patches.drivers/device-property-fix-fwnode_graph_get_next_endpoint-d.patch
patches.drivers/platform-msi-Free-descriptors-in-platform_msi_domain.patch
patches.fixes/0001-x86-speculation-l1tf-Drop-the-swap-storage-limit-res.patch
+ patches.fixes/tools-lib-lockdep-Rename-trywlock-into-trywrlock.patch
patches.arch/powerpc-pkeys-Fix-handling-of-pkey-state-across-fork.patch
patches.drivers/can-flexcan-flexcan_irq-fix-indention.patch
patches.drivers/wlcore-Fix-the-return-value-in-case-of-error-in-wlco.patch