Imported from util-linux-2.12r-pre1 tarball.

diff --git a/HISTORY b/HISTORY
index a8035d3121582f3d2fb9886c43574ae6133a4a3f..eddd64d047383024c550a7234b2c137a0ae075e0 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,10 @@
+util-linux 2.12r-pre1
+
+* cfdisk: fix a segfault with ReiserFS partitions
+* umount: disallow -r option for non-root users
+
 util-linux 2.12q
+
 * updated translation: nl
 
 util-linux 2.12q-pre2

diff --git a/VERSION b/VERSION
index 8765ff9e74c053b602e5fbbdbe3cae63f61c531b..0e19e9726dedcab54f1d6c95ab4d007ca74d2ffd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12q
+2.12r-pre1

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 46bc494e1d5d6598265ff93d4cd92a7a5668b960..30a888de8544a4e0d09687d106a031c6028205e5 100644 (file)
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -717,7 +717,7 @@ get_linux_label(int i) {
        offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
                + REISERFS_DISK_OFFSET_IN_BYTES;
        if (ext2_llseek(fd, offset, SEEK_SET) == offset
-           && read(fd, &reiserfsb, 1024) == 1024
+           && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb)
            && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
                if (reiserfs_is_3_6) {
                        /* label only on version 3.6 onward */

diff --git a/mount/umount.c b/mount/umount.c
index b26c28d4515ff9d483fa5bb220da34bd7a373ddb..db63d96a89370b63154687b005a88d08d55361ce 100644 (file)
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -714,7 +714,7 @@ main (int argc, char *argv[]) {
 
        if (getuid () != geteuid ()) {
                suid = 1;
-               if (all || types || nomtab || force)
+               if (all || types || nomtab || force || remount)
                        die (2, _("umount: only root can do that"));
        }