diff options
| author | Eric Paris | 2009-05-13 18:50:40 +0200 |
|---|---|---|
| committer | James Morris | 2009-05-20 00:30:05 +0200 |
| commit | fbaa58696cef848de818768783ef185bd3f05158 (patch) | |
| tree | 0055562c31266189533099d34f0909a0ec4c0bd4 /drivers/char/tpm | |
| parent | Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| download | kernel-qcow2-linux-fbaa58696cef848de818768783ef185bd3f05158.tar.gz kernel-qcow2-linux-fbaa58696cef848de818768783ef185bd3f05158.tar.xz kernel-qcow2-linux-fbaa58696cef848de818768783ef185bd3f05158.zip | |
TPM: get_event_name stack corruption
get_event_name uses sprintf to fill a buffer declared on the stack. It fills
the buffer 2 bytes at a time. What the code doesn't take into account is that
sprintf(buf, "%02x", data) actually writes 3 bytes. 2 bytes for the data and
then it nul terminates the string. Since we declare buf to be 40 characters
long and then we write 40 bytes of data into buf sprintf is going to write 41
characters. The fix is to leave room in buf for the nul terminator.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm_bios.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c index ed306eb1057f..0c2f55a38b95 100644 --- a/drivers/char/tpm/tpm_bios.c +++ b/drivers/char/tpm/tpm_bios.c @@ -212,7 +212,8 @@ static int get_event_name(char *dest, struct tcpa_event *event, unsigned char * event_entry) { 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; struct tcpa_pc_event *pc_event; |