From a4fb2a7b7688f3a7cb36e17b9d8c661ac44a41a4 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Wed, 13 May 2020 17:43:58 +0200 Subject: [PATCH] include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap Closes: #960271 --- debian/changelog | 7 ++ ...ux-swab.h-fix-userspace-breakage-use.patch | 72 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 80 insertions(+) create mode 100644 debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch diff --git a/debian/changelog b/debian/changelog index 6cac52587..c9a2c058e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.19.118-3) UNRELEASED; urgency=medium + + * include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for + swap (Closes: #960271) + + -- Salvatore Bonaccorso Wed, 13 May 2020 17:44:43 +0200 + linux (4.19.118-2) buster; urgency=medium * Merge changes from 4.19.67-2+deb10u2 to include all security fixes from diff --git a/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch b/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch new file mode 100644 index 000000000..8912e7b38 --- /dev/null +++ b/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch @@ -0,0 +1,72 @@ +From: Christian Borntraeger +Date: Thu, 20 Feb 2020 20:04:03 -0800 +Subject: include/uapi/linux/swab.h: fix userspace breakage, use + __BITS_PER_LONG for swap +Origin: https://git.kernel.org/linus/467d12f5c7842896d2de3ced74e4147ee29e97c8 +Bug-Debian: https://bugs.debian.org/960271 + +QEMU has a funny new build error message when I use the upstream kernel +headers: + + CC block/file-posix.o + In file included from /home/cborntra/REPOS/qemu/include/qemu/timer.h:4, + from /home/cborntra/REPOS/qemu/include/qemu/timed-average.h:29, + from /home/cborntra/REPOS/qemu/include/block/accounting.h:28, + from /home/cborntra/REPOS/qemu/include/block/block_int.h:27, + from /home/cborntra/REPOS/qemu/block/file-posix.c:30: + /usr/include/linux/swab.h: In function `__swab': + /home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:34: error: "sizeof" is not defined, evaluates to 0 [-Werror=undef] + 20 | #define BITS_PER_LONG (sizeof (unsigned long) * BITS_PER_BYTE) + | ^~~~~~ + /home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:41: error: missing binary operator before token "(" + 20 | #define BITS_PER_LONG (sizeof (unsigned long) * BITS_PER_BYTE) + | ^ + cc1: all warnings being treated as errors + make: *** [/home/cborntra/REPOS/qemu/rules.mak:69: block/file-posix.o] Error 1 + rm tests/qemu-iotests/socket_scm_helper.o + +This was triggered by commit d5767057c9a ("uapi: rename ext2_swab() to +swab() and share globally in swab.h"). That patch is doing + + #include + +but it uses BITS_PER_LONG. + +The kernel file asm/bitsperlong.h provide only __BITS_PER_LONG. + +Let us use the __ variant in swap.h + +Link: http://lkml.kernel.org/r/20200213142147.17604-1-borntraeger@de.ibm.com +Fixes: d5767057c9a ("uapi: rename ext2_swab() to swab() and share globally in swab.h") +Signed-off-by: Christian Borntraeger +Cc: Yury Norov +Cc: Allison Randal +Cc: Joe Perches +Cc: Thomas Gleixner +Cc: William Breathitt Gray +Cc: Torsten Hilbrich +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + include/uapi/linux/swab.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h +index fa7f97da5b76..7272f85d6d6a 100644 +--- a/include/uapi/linux/swab.h ++++ b/include/uapi/linux/swab.h +@@ -135,9 +135,9 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val) + + static __always_inline unsigned long __swab(const unsigned long y) + { +-#if BITS_PER_LONG == 64 ++#if __BITS_PER_LONG == 64 + return __swab64(y); +-#else /* BITS_PER_LONG == 32 */ ++#else /* __BITS_PER_LONG == 32 */ + return __swab32(y); + #endif + } +-- +2.26.2 + diff --git a/debian/patches/series b/debian/patches/series index c4eedde94..945f03de7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -100,6 +100,7 @@ bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch debian/revert-objtool-fix-config_stack_validation-y-warning.patch bugfix/all/mt76-use-the-correct-hweight8-function.patch bugfix/all/rtc-s35390a-set-uie_unsupported.patch +bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch # Miscellaneous features