vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/verify.c (free_pk): Plug memory leak.

Browse source 
(grub_load_public_key): Likewise.
	(grub_verify_signature_real): Likewise.
	(grub_cmd_verify_signature): Likewise.
This commit is contained in:
Vladimir Serbinenko 2013-11-18 02:40:17 +01:00
parent da93d6753b
commit 7bbb60cfbd
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/verify.c (free_pk): Plug memory leak.
(grub_load_public_key): Likewise.
(grub_verify_signature_real): Likewise.
(grub_cmd_verify_signature): Likewise.
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/legacycfg.c (grub_legacy_check_md5_password): Plug * grub-core/commands/legacycfg.c (grub_legacy_check_md5_password): Plug

30
grub-core/commands/verify.c
View file

@ -192,6 +192,10 @@ free_pk (struct grub_public_key *pk)
struct grub_public_subkey *nsk, *sk; struct grub_public_subkey *nsk, *sk;
for (sk = pk->subkeys; sk; sk = nsk) for (sk = pk->subkeys; sk; sk = nsk)
{ {
grub_size_t i;
for (i = 0; i < ARRAY_SIZE (sk->mpis); i++)
if (sk->mpis[i])
gcry_mpi_release (sk->mpis[i]);
nsk = sk->next; nsk = sk->next;
grub_free (sk); grub_free (sk);
} }
@ -244,6 +248,7 @@ grub_load_public_key (grub_file_t f)
if (type == 0xff) if (type == 0xff)
{ {
grub_free (fingerprint_context); grub_free (fingerprint_context);
grub_free (buffer);
return ret; return ret;
} }
@ -631,6 +636,9 @@ grub_verify_signature_real (char *buf, grub_size_t size,
if ((*pkalgos[pk].algo)->verify (0, hmpi, mpis, sk->mpis, 0, 0)) if ((*pkalgos[pk].algo)->verify (0, hmpi, mpis, sk->mpis, 0, 0))
goto fail; goto fail;
grub_free (context);
grub_free (readbuf);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
fail: fail:
@ -736,8 +744,8 @@ static grub_err_t
grub_cmd_verify_signature (grub_extcmd_context_t ctxt, grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
int argc, char **args) int argc, char **args)
{ {
grub_file_t f, sig; grub_file_t f = NULL, sig = NULL;
grub_err_t err; grub_err_t err = GRUB_ERR_NONE;
struct grub_public_key *pk = NULL; struct grub_public_key *pk = NULL;
grub_dprintf ("crypt", "alive\n"); grub_dprintf ("crypt", "alive\n");
@ -768,19 +776,27 @@ grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
grub_file_filter_disable_all (); grub_file_filter_disable_all ();
f = grub_file_open (args[0]); f = grub_file_open (args[0]);
if (!f) if (!f)
return grub_errno; {
err = grub_errno;
goto fail;
}
grub_file_filter_disable_all (); grub_file_filter_disable_all ();
sig = grub_file_open (args[1]); sig = grub_file_open (args[1]);
if (!sig) if (!sig)
{ {
grub_file_close (f); err = grub_errno;
return grub_errno; goto fail;
} }
err = grub_verify_signature (f, sig, pk); err = grub_verify_signature (f, sig, pk);
grub_file_close (f); fail:
grub_file_close (sig); if (sig)
grub_file_close (sig);
if (f)
grub_file_close (f);
if (pk)
free_pk (pk);
return err; return err;
} }