diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 20:28:35 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 20:28:35 +0200 |
| commit | 9bd7de51ee8537094656149eaf45338cadb7d7d4 (patch) | |
| tree | a691987319dfcdb07de2bce619746f88d26882c4 /drivers/char/tpm/tpm_bios.c | |
| parent | e4b636366c00738b9609cda307014d71b1225b7f (diff) | |
| parent | 6a44587ee716ac911082cbdec766e5b3f051c071 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/ide/ide-io.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/char/tpm/tpm_bios.c')
| -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 ed306eb1057..0c2f55a38b9 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; |