Attachment 83407 Details for Bug 116950

[patch] Fix: buffer overflow in the Root_FS_Type string

jfs-fix_Root_FS_Type_overflow.patch (text/plain), 1.37 KB, created by Andrea Righi on 2006-05-15 08:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrea Righi

Created: 2006-05-15 08:10:46 UTC

Size: 1.37 KB

patch

obsolete

>--- libfs/fssubs.c.orig	2006-05-15 09:44:38.000000000 +0200
>+++ libfs/fssubs.c	2006-05-15 10:01:56.000000000 +0200
>@@ -97,10 +97,12 @@
> 	FILE *Mount_Records;	/* Pointer for system's mount records */
> 	struct mntent *Mount_Data;	/* Holds data for entry in mount list */
> 	int Mounted_RC = 0;	/* Holds return code.             */
>-	char Root_FS_Type[] = "0000000";
>+	char Root_FS_Type[128];
> 
> #define ROOT_DIR "/"
> 
>+	memset(Root_FS_Type, 0, sizeof(Root_FS_Type));
>+
> 	/* Attempt to open /proc/mounts for access. */
> 	if ((Mount_Records = setmntent("/proc/mounts", "r")) == NULL) {
> 		/* Unable to access list of mounted devices in /proc/mounts! */
>@@ -115,7 +117,7 @@
> 	while ((Mount_Data = getmntent(Mount_Records)) != NULL) {
> 		/* save root file system type for later, if needed */
> 		if (strcmp(ROOT_DIR, Mount_Data->mnt_dir) == 0)
>-			strcpy(Root_FS_Type, Mount_Data->mnt_type);
>+			strncpy(Root_FS_Type, Mount_Data->mnt_type, sizeof(Root_FS_Type) - 1);
> 		if (strcmp(Device_Name, Mount_Data->mnt_fsname) == 0)
> 			break;
> 	}
>@@ -141,8 +143,7 @@
> 				 * Make a best effort to ensure that
> 				 * the root file system type is jfs
> 				 */
>-				if ((strcmp(Root_FS_Type, "0000000") != '0') &&
>-				    (strcmp(Root_FS_Type, "jfs") != 0))
>+				if (strncmp(Root_FS_Type, "jfs", sizeof(Root_FS_Type) - 1) != 0)
> 					/* is mounted, found type, is not type jfs */
> 					Mounted_RC = MSG_JFS_NOT_JFS;
> 			}

Actions: View | Diff

Attachments on bug 116950: 49895 | 49897 | 83407