Commit de5bd6c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull gcc-plugins fixes from Kees Cook:
 "Tiny gcc-plugin fixes for v5.12-rc2. These issues are small but have
  been reported a couple times now by static analyzers, so best to get
  them fixed to reduce the noise. :)

   - Fix coding style issues (Jason Yan)"

* tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  gcc-plugins: latent_entropy: remove unneeded semicolon
  gcc-plugins: structleak: remove unneeded variable 'ret'
parents 8b24ef44 5477edca

scripts/gcc-plugins/latent_entropy_plugin.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -524,7 +524,7 @@ static unsigned int latent_entropy_execute(void) 
	while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {

	while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {

		perturb_local_entropy(bb, local_entropy);

		perturb_local_entropy(bb, local_entropy);

		bb = bb->next_bb;

		bb = bb->next_bb;

	};

	}





	/* 4. mix local entropy into the global entropy variable */

	/* 4. mix local entropy into the global entropy variable */

	perturb_latent_entropy(local_entropy);

	perturb_latent_entropy(local_entropy);

scripts/gcc-plugins/structleak_plugin.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -170,7 +170,6 @@ static void initialize(tree var) 
static unsigned int structleak_execute(void)

static unsigned int structleak_execute(void)

{

{

	basic_block bb;

	basic_block bb;

	unsigned int ret = 0;

	tree var;

	tree var;

	unsigned int i;

	unsigned int i;
@@ -200,7 +199,7 @@ static unsigned int structleak_execute(void) 
			initialize(var);

			initialize(var);

	}

	}





	return ret;

	return 0;

}

}





#define PASS_NAME structleak

#define PASS_NAME structleak