Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 015ed943 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'maybe-uninitialized' (patches from Arnd) 

Merge fixes for -Wmaybe-uninitialized from Arnd Bergmann:
 "It took a while for some patches to make it into mainline through
  maintainer trees, but the 28-patch series is now reduced to 10, with
  one tiny patch added at the end.

  Aside from patches that are no longer required, I did these changes
  compared to version 1:

   - Dropped "iio: maxim_thermocouple: detect invalid storage size in
     read()", which is currently in linux-next as commit 32cb7d27.
     This is the only remaining warning I see for a couple of corner
     cases (kbuild bot reports it on blackfin, kernelci bot and arm-soc
     bot both report it on arm64)

   - Dropped "brcmfmac: avoid maybe-uninitialized warning in
     brcmf_cfg80211_start_ap", which is currently in net/master merge
     pending.

   - Dropped two x86 patches, "x86: math-emu: possible uninitialized
     variable use" and "x86: mark target address as output in 'insb'
     asm" as they do not seem to trigger for a default build, and I got
     no feedback on them. Both of these are ancient issues and seem
     harmless, I will send them again to the x86 maintainers once the
     rest is merged.

   - Dropped "rbd: false-postive gcc-4.9 -Wmaybe-uninitialized" based on
     feedback from Ilya Dryomov, who already has a different fix queued
     up for v4.10. The kbuild bot reports this as a warning for xtensa.

   - Replaced "crypto: aesni: avoid -Wmaybe-uninitialized warning" with
     a simpler patch, this one always triggers but my first solution
     would not be safe for linux-4.9 any more at this point. I'll follow
     up with the larger patch as a cleanup for 4.10.

   - Replaced "dib0700: fix nec repeat handling" with a better one,
     contributed by Sean Young"

* -Wmaybe-uninitialized fixes:
  Kbuild: enable -Wmaybe-uninitialized warnings by default
  pcmcia: fix return value of soc_pcmcia_regulator_set
  infiniband: shut up a maybe-uninitialized warning
  crypto: aesni: shut up -Wmaybe-uninitialized warning
  rc: print correct variable for z8f0811
  dib0700: fix nec repeat handling
  s390: pci: don't print uninitialized data for debugging
  nios2: fix timer initcall return value
  x86: apm: avoid uninitialized data
  NFSv4.1: work around -Wmaybe-uninitialized warning
  Kbuild: enable -Wmaybe-uninitialized warning for "make W=1"
parents 968ef8de 4324cb23

Makefile

+6 −4
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ LDFLAGS_MODULE = 
CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

LDFLAGS_vmlinux =

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized

CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
@@ -620,7 +620,6 @@ ARCH_CFLAGS := 
include arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
@@ -629,15 +628,18 @@ KBUILD_CFLAGS += $(call cc-option,-fdata-sections,) 
endif



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2

KBUILD_CFLAGS	+= -O2 $(call cc-disable-warning,maybe-uninitialized,)

else

KBUILD_CFLAGS   += -O2

endif

endif



KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \

			$(call cc-disable-warning,maybe-uninitialized,))



# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)

arch/arc/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ cflags-$(CONFIG_ARC_DW2_UNWIND) += -fasynchronous-unwind-tables $(cfi) 
ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE

# Generic build system uses -O2, we want -O3

# Note: No need to add to cflags-y as that happens anyways

ARCH_CFLAGS += -O3

#

# Disable the false maybe-uninitialized warings gcc spits out at -O3

ARCH_CFLAGS += -O3 $(call cc-disable-warning,maybe-uninitialized,)

endif



# small data is default for elf32 tool-chain. If not usable, disable it

arch/nios2/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static int __init nios2_time_init(struct device_node *timer) 
		ret = nios2_clocksource_init(timer);

		break;

	default:

		ret = 0;

		break;

	}

arch/s390/pci/pci_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg, 
	dma_addr_t dma_addr_base, dma_addr;

	int flags = ZPCI_PTE_VALID;

	struct scatterlist *s;

	unsigned long pa;

	unsigned long pa = 0;

	int ret;



	size = PAGE_ALIGN(size);

arch/x86/crypto/aesni-intel_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int helper_rfc4106_encrypt(struct aead_request *req) 
	unsigned long auth_tag_len = crypto_aead_authsize(tfm);

	u8 iv[16] __attribute__ ((__aligned__(AESNI_ALIGN)));

	struct scatter_walk src_sg_walk;

	struct scatter_walk dst_sg_walk;

	struct scatter_walk dst_sg_walk = {};

	unsigned int i;



	/* Assuming we are supporting rfc4106 64-bit extended */
@@ -968,7 +968,7 @@ static int helper_rfc4106_decrypt(struct aead_request *req) 
	u8 iv[16] __attribute__ ((__aligned__(AESNI_ALIGN)));

	u8 authTag[16];

	struct scatter_walk src_sg_walk;

	struct scatter_walk dst_sg_walk;

	struct scatter_walk dst_sg_walk = {};

	unsigned int i;



	if (unlikely(req->assoclen != 16 && req->assoclen != 20))