diff mbox series

[5.10,156/290] kbuild: clamp SUBLEVEL to 255

Message ID	20210315135547.188981758@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH 5.10 156/290] kbuild: clamp SUBLEVEL to 255 Date: Mon, 15 Mar 2021 14:54:09 +0100 Message-Id: <20210315135547.188981758@linuxfoundation.org> In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/290] powerpc/perf: Fix handling of privilege level checks in perf interrupt context [5.10,003/290] powerpc/pseries: Dont enforce MSI affinity with kdump [5.10,007/290] net: Fix gro aggregation for udp encaps with zero csum [5.10,013/290] can: flexcan: enable RX FIFO after FRZ/HALT valid [5.10,016/290] tcp: Fix sign comparison bug in getsockopt(TCP_ZEROCOPY_RECEIVE) [5.10,018/290] netfilter: nf_nat: undo erroneous tcp edemux lookup [5.10,020/290] net: always use icmp{,v6}_ndo_send from ndo_start_xmit [5.10,025/290] samples, bpf: Add missing munmap in xdpsock [5.10,030/290] powerpc/603: Fix protection of user pages mapped with PROT_NONE [5.10,037/290] net: enetc: dont overwrite the RSS indirection table when initializing [5.10,039/290] net: enetc: fix incorrect TPID when receiving 802.1ad tagged packets [5.10,040/290] net: enetc: dont disable VLAN filtering in IFF_PROMISC mode [5.10,043/290] net: enetc: keep RX ring consumer index in sync with hardware [5.10,045/290] net/mlx4_en: update moderation when config reset [5.10,050/290] net: dsa: sja1105: fix SGMII PCS being forced to SPEED_UNKNOWN instead of SPEED_10 [5.10,051/290] net: usb: qmi_wwan: allow qmimux add/del with master up [5.10,054/290] net: stmmac: Fix VLAN filter delete timeout issue in Intel mGBE SGMII [5.10,055/290] stmmac: intel: Fixes clock registration error seen for multiple interfaces [5.10,057/290] net: davicom: Fix regulator not turned off on failed probe [5.10,058/290] net: davicom: Fix regulator not turned off on driver removal [5.10,060/290] net: qrtr: fix error return code of qrtr_sendmsg() [5.10,061/290] s390/qeth: fix memory leak after failed TX Buffer allocation [5.10,063/290] ixgbe: fail to create xfrm offload of IPsec tunnel mode SA [5.10,064/290] tools/resolve_btfids: Fix build error with older host toolchains [5.10,065/290] perf build: Fix ccache usage in $(CC) when generating arch errno table [5.10,069/290] ethtool: fix the check logic of at least one channel for RX/TX [5.10,070/290] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused [5.10,076/290] net: hns3: fix bug when calculating the TCAM table info [5.10,078/290] bnxt_en: reliably allocate IRQ table on reset to avoid crash [5.10,079/290] gpiolib: acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk [5.10,080/290] gpiolib: acpi: Allow to find GpioInt() resource by name and index [5.10,082/290] gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2 [5.10,084/290] drm/compat: Clear bounce structures [5.10,085/290] drm/amd/display: Add a backlight module option [5.10,088/290] drm/amd/pm: bug fix for pcie dpm [5.10,091/290] drm/amdgpu/display: handle aux backlight in backlight_get_brightness [5.10,093/290] drm/shmem-helper: Dont remove the offset in vm_area_struct pgoff [5.10,094/290] drm: Use USB controllers DMA mask when importing dmabufs [5.10,099/290] s390/crypto: return -EFAULT if copy_to_user() fails [5.10,100/290] qxl: Fix uninitialised struct field head.surface_id [5.10,101/290] sh_eth: fix TRSCER mask for R7S9210 [5.10,104/290] media: v4l: vsp1: Fix uif null pointer access [5.10,113/290] net: dsa: implement a central TX reallocation procedure [5.10,114/290] net: dsa: tag_ksz: dont allocate additional memory for padding/tagging [5.10,119/290] net: dsa: tag_lan9303: let DSA core deal with TX reallocation [5.10,121/290] net: dsa: tag_brcm: let DSA core deal with TX reallocation [5.10,125/290] net: dsa: tag_mtk: fix 802.1ad VLAN egress [5.10,126/290] enetc: Fix unused var build warning for CONFIG_OF [5.10,127/290] net: enetc: initialize RFS/RSS memories for unused ports too [5.10,128/290] ath11k: peer delete synchronization with firmware [5.10,132/290] i2c: rcar: optimize cacheline to minimize HW race condition [5.10,133/290] scsi: ufs: WB is only available on LUN #0 to #7 [5.10,134/290] udf: fix silent AED tagLocation corruption [5.10,136/290] mmc: mxs-mmc: Fix a resource leak in an error handling path in mxs_mmc_probe() [5.10,137/290] mmc: mediatek: fix race condition between msdc_request_timeout and irq [5.10,138/290] mmc: sdhci-iproc: Add ACPI bindings for the RPi [5.10,139/290] Platform: OLPC: Fix probe error handling [5.10,142/290] powerpc: improve handling of unrecoverable system reset [5.10,146/290] iommu/amd: Fix performance counter initialization [5.10,149/290] sparc64: Use arch_validate_flags() to validate ADI flag [5.10,150/290] Input: applespi - dont wait for responses to commands indefinitely. [5.10,153/290] drivers/base: build kunit tests without structleak plugin [5.10,155/290] ext4: dont try to processed freed blocks until mballoc is initialized [5.10,156/290] kbuild: clamp SUBLEVEL to 255 [5.10,158/290] i40e: Fix memory leak in i40e_probe [5.10,160/290] s390/smp: __smp_rescan_cpus() - move cpumask away from stack [5.10,163/290] scsi: libiscsi: Fix iscsi_prep_scsi_cmd_pdu() error handling [5.10,164/290] scsi: target: core: Add cmd length set before cmd complete [5.10,167/290] mmc: sdhci: Update firmware interface API [5.10,169/290] ARM: assembler: introduce adr_l, ldr_l and str_l macros [5.10,170/290] ARM: efistub: replace adrl pseudo-op with adr_l macro invocation [5.10,172/290] ALSA: hda/hdmi: Cancel pending works before suspend [5.10,173/290] ALSA: hda/conexant: Add quirk for mute LED control on HP ZBook G5 [5.10,174/290] ALSA: hda/ca0132: Add Sound BlasterX AE-5 Plus support [5.10,176/290] ALSA: hda: Flush pending unsolicited events before suspend [5.10,178/290] ALSA: usb-audio: Fix "cannot get freq eq" errors on Dell AE515 sound bar [5.10,179/290] ALSA: usb-audio: Apply the control quirk to Plantronics headsets [5.10,182/290] ALSA: usb-audio: fix use after free in usb_audio_disconnect [5.10,183/290] Revert 95ebabde382c ("capabilities: Dont allow writing ambiguous v3 file capabilit... [5.10,184/290] block: Discard page cache of zone reset target range [5.10,186/290] arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL [5.10,187/290] arm64: mte: Map hotplugged memory as Normal Tagged [5.10,188/290] arm64: perf: Fix 64-bit event counter read truncation [5.10,190/290] s390/dasd: fix hanging IO request during DASD driver unbind [5.10,196/290] cifs: do not send close in compound create+close requests [5.10,199/290] USB: gadget: u_ether: Fix a configfs return code [5.10,202/290] usb: dwc3: qcom: Add missing DWC3 OF node refcount decrement [5.10,203/290] usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot [5.10,204/290] usb: dwc3: qcom: add ACPI device id for sc8180x [5.10,206/290] USB: usblp: fix a hang in poll() if disconnected [5.10,207/290] usb: renesas_usbhs: Clear PIPECFG for re-enabling pipe with other EPNUM [5.10,210/290] usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing [5.10,213/290] USB: serial: ch341: add new Product ID [5.10,214/290] USB: serial: cp210x: add ID for Acuity Brands nLight Air Adapter [5.10,215/290] USB: serial: cp210x: add some more GE USB IDs [5.10,216/290] usbip: fix stub_dev to check for stream socket [5.10,217/290] usbip: fix vhci_hcd to check for stream socket [5.10,218/290] usbip: fix vudc to check for stream socket [5.10,221/290] usbip: fix vudc usbip_sockfd_store races leading to gpf [5.10,222/290] Revert "serial: max310x: rework RX interrupt handling" [5.10,223/290] misc/pvpanic: Export module FDT device table [5.10,224/290] misc: fastrpc: restrict user apps from sending kernel RPC messages [5.10,227/290] staging: rtl8712: unterminated string leads to read overflow [5.10,228/290] staging: rtl8188eu: fix potential memory corruption in rtw_check_beacon_data() [5.10,229/290] staging: ks7010: prevent buffer overflow in ks_wlan_set_scan() [5.10,233/290] staging: comedi: addi_apci_1500: Fix endian problem for command sample [5.10,234/290] staging: comedi: adv_pci1710: Fix endian problem for AI command data [5.10,235/290] staging: comedi: das6402: Fix endian problem for AI command data [5.10,236/290] staging: comedi: das800: Fix endian problem for AI command data [5.10,237/290] staging: comedi: dmm32at: Fix endian problem for AI command data [5.10,238/290] staging: comedi: me4000: Fix endian problem for AI command data [5.10,242/290] cpufreq: qcom-hw: fix dereferencing freed memory data [5.10,244/290] arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory [5.10,246/290] NFS: Dont revalidate the directory permissions on a lookup failure [5.10,248/290] NFSv4.2: fix return value of _nfs4_get_security_label() [5.10,249/290] block: rsxx: fix error return code of rsxx_pci_probe() [5.10,250/290] nvme-fc: fix racing controller reset and create association [5.10,252/290] arm64: mm: use a 48-bit ID map when possible on 52-bit VA builds [5.10,257/290] seqlock,lockdep: Fix seqcount_latch_init() [5.10,258/290] stop_machine: mark helpers __always_inline [5.10,259/290] include/linux/sched/mm.h: use rcu_dereference in in_vfork() [5.10,262/290] linux/compiler-clang.h: define HAVE_BUILTIN_BSWAP* [5.10,264/290] efi: stub: omit SetVirtualAddressMap() if marked unsupported in RT_PROP table [5.10,265/290] powerpc/64s: Fix instruction encoding for lis in ppc_function_entry() [5.10,268/290] binfmt_misc: fix possible deadlock in bm_register_write [5.10,270/290] x86/sev-es: Introduce ip_within_syscall_gap() helper [5.10,271/290] x86/sev-es: Check regs->sp is trusted before adjusting #VC IST stack [5.10,275/290] x86/entry: Fix entry/exit mismatch on failed fast 32-bit syscalls [5.10,276/290] KVM: x86: Ensure deadline timer has truly expired before posting its IRQ [5.10,277/290] KVM: kvmclock: Fix vCPUs > 64 cant be online/hotpluged [5.10,278/290] KVM: arm64: Fix range alignment when walking page tables [5.10,280/290] KVM: arm64: nvhe: Save the SPE context early [5.10,281/290] KVM: arm64: Reject VM creation when the default IPA size is unsupported [5.10,284/290] mm/madvise: replace ptrace attach requirement for process_madvise [5.10,285/290] KVM: arm64: Ensure I-cache isolation between vcpus of a same VM [5.10,286/290] mm/page_alloc.c: refactor initialization of struct page for holes in memory layout [5.10,289/290] KVM: arm64: Fix nVHE hyp panic host context restore

Commit Message

Greg KH March 15, 2021, 1:54 p.m. UTC

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

[ Upstream commit 9b82f13e7ef316cdc0a8858f1349f4defce3f9e0 ]

Right now if SUBLEVEL becomes larger than 255 it will overflow into the
territory of PATCHLEVEL, causing havoc in userspace that tests for
specific kernel version.

While userspace code tests for MAJOR and PATCHLEVEL, it doesn't test
SUBLEVEL at any point as ABI changes don't happen in the context of
stable tree.

Thus, to avoid overflows, simply clamp SUBLEVEL to it's maximum value in
the context of LINUX_VERSION_CODE. This does not affect "make
kernelversion" and such.

Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 7fdb78b48f55..56d375763b0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1247,9 +1247,15 @@  define filechk_utsrelease.h
 endef
 
 define filechk_version.h
-	echo \#define LINUX_VERSION_CODE $(shell                         \
-	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
-	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
+	if [ $(SUBLEVEL) -gt 255 ]; then                                 \
+		echo \#define LINUX_VERSION_CODE $(shell                 \
+		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \
+	else                                                             \
+		echo \#define LINUX_VERSION_CODE $(shell                 \
+		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
+	fi;                                                              \
+	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) +  \
+	((c) > 255 ? 255 : (c)))'
 endef
 
 $(version_h): FORCE