From: Ben Hutchings Date: Fri, 11 Mar 2016 04:06:00 +0000 (+0000) Subject: Merge branch 'sid' X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=405eb02c20c348307a696d3afc8b22d212a77cdb;hp=398d6252cb71a88dd999b3c8d6e2b4c82d224c01 Merge branch 'sid' Merge the uploaded changes and update the version for the open changelog entry. --- diff --git a/debian/changelog b/debian/changelog index 812d78f..618d70d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,37 @@ -nfs-utils (1:1.2.8-7) UNRELEASED; urgency=medium +nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium * Update debian/watch -- Ben Hutchings Mon, 23 Mar 2015 16:33:59 +0000 +nfs-utils (1:1.2.8-9) unstable; urgency=medium + + * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc- + compi.patch: cherry-pick fix from upstream for a segfault in + add_name with newer gcc compilers. Closes: #757835, LP: #1355829. + + -- Steve Langasek Tue, 12 Aug 2014 17:12:38 -0700 + +nfs-utils (1:1.2.8-8) unstable; urgency=medium + + * Upload to unstable where this belongs. + * libtirpc versioning against 0.2.4, not 0.2.4-2. + * Drop versioned dependency on rpcbind; nothing in the rpcbind relationship + requires this. + + -- Steve Langasek Mon, 11 Aug 2014 00:20:32 -0700 + +nfs-utils (1:1.2.8-7) experimental; urgency=medium + + * Get rid of libgssglue1. + Don't pass "--with-gssglue" to ./configure. + Build-depend on libtirpc-dev (>= 0.2.4-2~). + Depend on libtirpc1 (>= 0.2.4-2~). + Depend on rpcbind (>= 0.2.1-5~). + * Remove debian/source/options. + + -- Anibal Monsalve Salazar Sat, 02 Aug 2014 12:25:47 +0100 + nfs-utils (1:1.2.8-6) unstable; urgency=medium * Fix the sec=krb5* handling in debian/nfs-common.init to properly match diff --git a/debian/control b/debian/control index 021c5a6..51b1a11 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: standard Section: net Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Steve Langasek -Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev +Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev Standards-Version: 3.9.0 Homepage: http://nfs.sourceforge.net/ Vcs-Git: git://git.debian.org/kernel/nfs-utils.git @@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=kernel/nfs-utils.git Package: nfs-kernel-server Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3) +Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4) Provides: knfs, nfs-server Conflicts: knfs, nfs-server Replaces: knfs, nfs-server @@ -32,7 +32,7 @@ Homepage: http://nfs.sourceforge.net/ Package: nfs-common Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3) +Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3), libtirpc1 (>= 0.2.4) Recommends: python Suggests: open-iscsi, watchdog Provides: nfs-client diff --git a/debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch b/debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch new file mode 100644 index 0000000..a2ea91b --- /dev/null +++ b/debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch @@ -0,0 +1,63 @@ +From 8b03fdbfb0dd8e0147aa61ff30b8311235caf5f3 Mon Sep 17 00:00:00 2001 +From: Jeff Layton +Date: Thu, 1 May 2014 11:15:16 -0400 +Subject: [PATCH] mountd: fix segfault in add_name with newer gcc compilers +Bug-Debian: http://bugs.debian.org/757835 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1355829 + +I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some +NULL pointer checks got reordered such that a pointer was dereferenced +before checking to see whether it was NULL. The problem was due to +nfs-utils relying on undefined behavior, which tricked gcc into assuming +that the pointer would never be NULL. + +At first I assumed that this was a compiler bug, but Jakub Jelinek and +Jeff Law pointed out: + +"If old is NULL, then: + + strncpy(new, old, cp-old); + +is undefined behavior (even when cp == old == NULL in that case), +therefore gcc assumes that old is never NULL, as otherwise it would be +invalid. + +Just guard + strncpy(new, old, cp-old); + new[cp-old] = 0; +with if (old) { ... }." + +This patch does that. If old is NULL though, then we still need to +ensure that new is NULL terminated, lest the subsequent strcats walk off +the end of it. + +Cc: Jeff Law +Cc: Jakub Jelinek +Signed-off-by: Jeff Layton +Signed-off-by: Steve Dickson +--- + support/export/client.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/support/export/client.c b/support/export/client.c +index ba2db8f..e749cac 100644 +--- a/support/export/client.c ++++ b/support/export/client.c +@@ -482,8 +482,12 @@ add_name(char *old, const char *add) + else + cp = cp + strlen(cp); + } +- strncpy(new, old, cp-old); +- new[cp-old] = 0; ++ if (old) { ++ strncpy(new, old, cp-old); ++ new[cp-old] = 0; ++ } else { ++ new[0] = 0; ++ } + if (cp != old && !*cp) + strcat(new, ","); + strcat(new, add); +-- +2.1.0.rc1 + diff --git a/debian/patches/series b/debian/patches/series index bf91ce0..8c74c78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 17-multiarch-kerberos-paths.patch 19-iscsiadm-path.patch 20-remove-autogenerated-man.patch +22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch diff --git a/debian/rules b/debian/rules index 569c416..5cff5ce 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,6 @@ build-stamp: --enable-nfsv41 \ --enable-ipv6 \ --enable-libmount-mount \ - --with-gssglue \ --with-tcp-wrappers $(MAKE) $(MAKEFLAGS) touch build-stamp