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

Unverified Commit b94bd57a authored by Kees Cook's avatar Kees Cook Committed by Michael Bestas
Browse files

erofs: Remove uninitialized_var() usage 

Using uninitialized_var() is dangerous as it papers over real bugs[1]
(or can in the future), and suppresses unrelated compiler warnings
(e.g. "unused variable"). If the compiler thinks it is uninitialized,
either simply initialize the variable or make compiler changes.

In preparation for removing[2] the[3] macro[4], remove all remaining
needless uses with the following script:

git grep '\buninitialized_var\b' | cut -d: -f1 | sort -u | \
	xargs perl -pi -e \
		's/\buninitialized_var\(([^\)]+)\)/\1/g;
		 s:\s*/\* (GCC be quiet|to make compiler happy) \*/$::g;'

drivers/video/fbdev/riva/riva_hw.c was manually tweaked to avoid
pathological white-space.

No outstanding warnings were found building allmodconfig with GCC 9.3.0
for x86_64, i386, arm64, arm, powerpc, powerpc64le, s390x, mips, sparc64,
alpha, and m68k.

[1] https://lore.kernel.org/lkml/20200603174714.192027-1-glider@google.com/
[2] https://lore.kernel.org/lkml/CA+55aFw+Vbj0i=1TGqCR5vQkCzWJ0QxK6CernOU6eedsudAixw@mail.gmail.com/
[3] https://lore.kernel.org/lkml/CA+55aFwgbgqhbp1fkxvRKEpzyR5J8n1vKT1VZdz9knmPuXhOeg@mail.gmail.com/
[4] https://lore.kernel.org/lkml/CA+55aFz2500WfbKXAx8s67wrm9=yVJu65TpLgN_ybYNv0VEOKA@mail.gmail.com/



Reviewed-by: Leon Romanovsky <leonro@mellanox.com> # drivers/infiniband and mlx4/mlx5
Acked-by: Jason Gunthorpe <jgg@mellanox.com> # IB
Acked-by: Kalle Valo <kvalo@codeaurora.org> # wireless drivers
Reviewed-by: Chao Yu <yuchao0@huawei.com> # erofs
Change-Id: If77dad2c11421fce9d2fad6d034e7f36d405e11c
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 9316ac8c

fs/erofs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio, 
 */

static int erofs_raw_access_readpage(struct file *file, struct page *page)

{

	erofs_off_t uninitialized_var(last_block);

	erofs_off_t last_block;

	struct bio *bio;



	trace_erofs_readpage(page, true);
@@ -285,7 +285,7 @@ static int erofs_raw_access_readpages(struct file *filp, 
				      struct list_head *pages,

				      unsigned int nr_pages)

{

	erofs_off_t uninitialized_var(last_block);

	erofs_off_t last_block;

	struct bio *bio = NULL;

	gfp_t gfp = readahead_gfp_mask(mapping);

	struct page *page = list_last_entry(pages, struct page, lru);

fs/erofs/zdata.c

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ static void z_erofs_submit_queue(struct super_block *sb, 
	struct z_erofs_decompressqueue *q[NR_JOBQUEUES];

	void *bi_private;

	/* since bio will be NULL, no need to initialize last_index */

	pgoff_t uninitialized_var(last_index);

	pgoff_t last_index;

	unsigned int nr_bios = 0;

	struct bio *bio = NULL;