summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-05-18 16:01:54 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-05-18 16:01:54 +1000
commit2a88dd996b3ad0a55bce5829779e6fc070f650e9 (patch)
tree27979e5c28ddafeacd7b62de96af74cc7cd5cecd /drivers
parent4074909e8843da4a5bc9759e436b0f581728d7f8 (diff)
parentc3d20103d08e5c0b6738fbd0acf3ca004e5356c5 (diff)
Merge commit 'security-testing/next'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/tpm_bios.c3
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;