From 9fc5e54819022fc2849af793635f625a069fd829 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 12 Jul 2009 08:15:38 +0000 Subject: [PATCH] Handle ide model name string (Igor Kovalenko) This handles fixed-size ide model name string without trailing zero. git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@509 f158a5a8-5612-0410-a976-696ce0be7e32 --- drivers/ide.c | 3 ++- drivers/ide.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ide.c b/drivers/ide.c index a55cb67..3636b3c 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -980,7 +980,8 @@ ob_ide_identify_drive(struct ide_drive *drive) drive->sect = id.sectors; } - strcpy(drive->model, (char *)id.model); + strncpy(drive->model, (char*)id.model, sizeof(id.model)); + drive->model[40] = '\0'; return 0; } diff --git a/drivers/ide.h b/drivers/ide.h index da79a71..d6c4b9f 100644 --- a/drivers/ide.h +++ b/drivers/ide.h @@ -146,7 +146,7 @@ struct ide_drive { char media; /* disk, cdrom, etc */ char addressing; /* chs/lba28/lba48 */ - char model[40]; /* name */ + char model[41]; /* name */ int nr; unsigned long sectors;