From: Harald Hoyer Date: Wed, 16 Sep 2009 15:42:15 +0000 Subject: [PATCH] scsi_id: prevent buffer overflow in check_fill_0x83_prespc3() Message-Id: <1253115735-32415-1-git-send-email-harald@redhat.com> List-Id: References: <1253115287-32328-1-git-send-email-harald@redhat.com> In-Reply-To: <1253115287-32328-1-git-send-email-harald@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org see https://bugzilla.redhat.com/show_bug.cgi?idQ6920 --- extras/scsi_id/scsi_serial.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c index 9235912..ab0ffd6 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/extras/scsi_id/scsi_serial.c @@ -578,11 +578,12 @@ static int check_fill_0x83_prespc3(struct udev *udev, /* serial has been memset to zero before */ j = strlen(serial); /* j = 1; */ - for (i = 0; i < page_83[3]; ++i) { + for (i = 0; (i < page_83[3]) && (j < max_len-3); ++i) { serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4]; serial[j++] = hex_str[ page_83[4+i] & 0x0f]; } - strcpy(serial_short, serial); + serial[max_len-1] = 0; + strncpy(serial_short, serial, max_len-1); return 0; } -- 1.6.2.5