Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2013-12-19 12:37:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslinux" Changes: -------- --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes 2013-04-09 07:10:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-12-19 12:37:42.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 16:12:44 UTC 2013 - [email protected] + +- geometry.diff: Fix segfault caused by a bug in geometry handling + (bnc#852856) + +------------------------------------------------------------------- New: ---- syslinux-4.04-geometry.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.1KIH7T/_old 2013-12-19 12:37:43.000000000 +0100 +++ /var/tmp/diff_new_pack.1KIH7T/_new 2013-12-19 12:37:43.000000000 +0100 @@ -46,6 +46,7 @@ Patch9: %{name}-%{version}-isohybrid_efi_optional.diff Patch10: %{name}-%{version}-isohybrid_mbr.diff Patch11: %{name}-%{version}-localboot.diff +Patch12: %{name}-%{version}-geometry.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,6 +74,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build cp %{SOURCE2} . ++++++ syslinux-4.04-geometry.diff ++++++ >From 73cd9bf26066cad0d4a483e31e1d89802a7ca1f9 Mon Sep 17 00:00:00 2001 From: Gene Cumm <[email protected]> Date: Wed, 11 May 2011 16:03:30 +0000 Subject: extlinux/main.c: Fix geometry handling 1) ioctl HDIO_GETGEO expects a pointer to a struct hd_geometry 2) struct stat's st_dev is the parent file used; st_rdev is what we want Reported-by: Michael Tokarev <[email protected]> Tested-By: Michael Tokarev <[email protected]> Signed-off-by: Gene Cumm <[email protected]> --- (limited to 'extlinux/main.c') diff --git a/extlinux/main.c b/extlinux/main.c index e5212a9..6aa6202 100755 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start) if ((size_t)snprintf(sysfs_name, sizeof sysfs_name, "/sys/dev/block/%u:%u/start", - major(st.st_dev), minor(st.st_dev)) + major(st.st_rdev), minor(st.st_rdev)) >= sizeof sysfs_name) return -1; @@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo) memset(geo, 0, sizeof *geo); - if (!ioctl(devfd, HDIO_GETGEO, &geo)) { + if (!ioctl(devfd, HDIO_GETGEO, geo)) { goto ok; } else if (!ioctl(devfd, FDGETPRM, &fd_str)) { geo->heads = fd_str.head; -- cgit v0.9.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
