Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c6d4cf7d567466b7d148ad4cf917a5b4aaa2ef3
commit 7c6d4cf7d567466b7d148ad4cf917a5b4aaa2ef3 Author: bouleetbil <[email protected]> Date: Mon Feb 22 10:15:46 2010 +0000 util-linux-ng-2.17-3-i686 *fixed a segfault now my cdrom works fine diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index 6875224..7641f66 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=util-linux-ng pkgver=2.17 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng"; backup=('etc/sysconfig/console' 'etc/sysconfig/numlock') @@ -18,8 +18,8 @@ source=($url/v2.17/util-linux-ng-$pkgver.tar.bz2 \ frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \ rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ - README.Frugalware) -signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + README.Frugalware blkid.diff) +signatures=($source.sign '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subpkgs=("${subpk...@]}" "libblkid") subdescs=("${subdes...@]}" 'Block device id library') diff --git a/source/base/util-linux-ng/blkid.diff b/source/base/util-linux-ng/blkid.diff new file mode 100644 index 0000000..cca99a1 --- /dev/null +++ b/source/base/util-linux-ng/blkid.diff @@ -0,0 +1,34 @@ +From 10f494e1a0ac09e144a42fcaeb72663674eb30fc Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Matthias=20K=C3=B6nig?= <[email protected]> +Date: Tue, 12 Jan 2010 13:58:28 +0100 +Subject: [PATCH] libblkid: fix segfault in drdb +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Check if blkid_probe_get_buffer() returns NULL to avoid dereferencing +a zero pointer resulting in a segfault. + +Signed-off-by: Matthias König <[email protected]> +--- + shlibs/blkid/src/superblocks/drbd.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/shlibs/blkid/src/superblocks/drbd.c b/shlibs/blkid/src/superblocks/drbd.c +index e0bbb4d..a56486e 100644 +--- a/shlibs/blkid/src/superblocks/drbd.c ++++ b/shlibs/blkid/src/superblocks/drbd.c +@@ -78,7 +78,8 @@ static int probe_drbd(blkid_probe pr, const struct blkid_idmag *mag) + blkid_probe_get_buffer(pr, + off, + sizeof(struct md_on_disk_08)); +- ++ if (!md) ++ return -1; + + if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08) + return -1; +-- +1.7.0 + +
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
