vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2007-05-17 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* util/biosdisk.c (linux_find_partition): Allocate real_dev on the
	stack instead of on the heap.

	* kern/disk.c (grub_disk_read): Make sure tmp_buf is big enough
	before doing a read on it.

	* configure.ac: Only use -fno-stack-protector for the target
	environment.
This commit is contained in:
jeroen 2007-05-17 19:03:42 +00:00
parent 21c8cbb1ab
commit 1ecb6cf2b4
5 changed files with 20 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

22
util/biosdisk.c
View file

@ -214,9 +214,9 @@ linux_find_partition (char *dev, unsigned long sector)
const char *format;
char *p;
int i;
char *real_dev;
char real_dev[PATH_MAX];
real_dev = xstrdup (dev);
strcpy(real_dev, dev);
if (have_devfs () && strcmp (real_dev + len - 5, "/disc") == 0)
{
@ -234,10 +234,7 @@ linux_find_partition (char *dev, unsigned long sector)
{
p = strchr (real_dev + 9, 'd');
if (! p)
{
free (real_dev);
return 0;
}
return 0;
p++;
while (*p && isdigit (*p))
@ -246,10 +243,7 @@ linux_find_partition (char *dev, unsigned long sector)
format = "p%d";
}
else
{
free (real_dev);
return 0;
}
return 0;
for (i = 1; i < 10000; i++)
{
@ -259,15 +253,11 @@ linux_find_partition (char *dev, unsigned long sector)
sprintf (p, format, i);
fd = open (real_dev, O_RDONLY);
if (! fd)
{
free (real_dev);
return 0;
}
return 0;
if (ioctl (fd, HDIO_GETGEO, &hdg))
{
close (fd);
free (real_dev);
return 0;
}
@ -276,12 +266,10 @@ linux_find_partition (char *dev, unsigned long sector)
if (hdg.start == sector)
{
strcpy (dev, real_dev);
free (real_dev);
return 1;
}
}
free (real_dev);
return 0;
}
#endif /* __linux__ */