From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 20 Mar 2021 12:52:41 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.263~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b28dd8b25d5166367e1e297a6a6348274479347f;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	kbuild-fix-linux-version.h-for-empty-sublevel-or-patchlevel-again.patch
---

diff --git a/queue-5.4/kbuild-fix-linux-version.h-for-empty-sublevel-or-patchlevel-again.patch b/queue-5.4/kbuild-fix-linux-version.h-for-empty-sublevel-or-patchlevel-again.patch
new file mode 100644
index 00000000000..dc3c96aee0e
--- /dev/null
+++ b/queue-5.4/kbuild-fix-linux-version.h-for-empty-sublevel-or-patchlevel-again.patch
@@ -0,0 +1,54 @@
+From 207da4c82ade9a6d59f7e794d737ba0748613fa2 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Sat, 27 Feb 2021 23:20:23 +0900
+Subject: kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit 207da4c82ade9a6d59f7e794d737ba0748613fa2 upstream.
+
+Commit 78d3bb4483ba ("kbuild: Fix <linux/version.h> for empty SUBLEVEL
+or PATCHLEVEL") fixed the build error for empty SUBLEVEL or PATCHLEVEL
+by prepending a zero.
+
+Commit 9b82f13e7ef3 ("kbuild: clamp SUBLEVEL to 255") re-introduced
+this issue.
+
+This time, we cannot take the same approach because we have C code:
+
+  #define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL)
+  #define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
+
+Replace empty SUBLEVEL/PATCHLEVEL with a zero.
+
+Fixes: 9b82f13e7ef3 ("kbuild: clamp SUBLEVEL to 255")
+Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Reviewed-and-tested-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Makefile |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -1177,15 +1177,17 @@ endef
+ define filechk_version.h
+ 	if [ $(SUBLEVEL) -gt 255 ]; then                                 \
+ 		echo \#define LINUX_VERSION_CODE $(shell                 \
+-		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \
++		expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + 255); \
+ 	else                                                             \
+ 		echo \#define LINUX_VERSION_CODE $(shell                 \
+-		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
++		expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
+ 	fi;                                                              \
+ 	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) +  \
+ 	((c) > 255 ? 255 : (c)))'
+ endef
+ 
++$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
++$(version_h): SUBLEVEL := $(if $(SUBLEVEL), $(SUBLEVEL), 0)
+ $(version_h): FORCE
+ 	$(call filechk,version.h)
+ 	$(Q)rm -f $(old_version_h)
diff --git a/queue-5.4/series b/queue-5.4/series
index eb0cec8f3f6..98fbe0df543 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -25,3 +25,4 @@ svcrdma-disable-timeouts-on-rdma-backchannel.patch
 vfio-iommu_api-should-be-selected.patch
 sunrpc-fix-refcount-leak-for-rpc-auth-modules.patch
 net-qrtr-fix-__netdev_alloc_skb-call.patch
+kbuild-fix-linux-version.h-for-empty-sublevel-or-patchlevel-again.patch