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

Commit 4fe11032 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  TPM: get_event_name stack corruption
parents 007a93a1 fbaa5869

drivers/char/tpm/tpm_bios.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,8 @@ static int get_event_name(char *dest, struct tcpa_event *event, 
			unsigned char * event_entry)

			unsigned char * event_entry)

{

{

	const char *name = "";

	const char *name = "";

	char data[40] = "";

	/* 41 so there is room for 40 data and 1 nul */

	char data[41] = "";

	int i, n_len = 0, d_len = 0;

	int i, n_len = 0, d_len = 0;

	struct tcpa_pc_event *pc_event;

	struct tcpa_pc_event *pc_event;