[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs-utils-1.3.0-gcc-4.9.patch

[Mike Frysinger (vapier)]

vapier      14/06/20 06:24:27

  Added:                nfs-utils-1.3.0-gcc-4.9.patch
  Log:
  Version bump #506760 by Nenad Peric.  Run keepdir on /etc/exports.d #470102 by Alon Bar-Lev.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch?rev=1.1&content-type=text/plain

Index: nfs-utils-1.3.0-gcc-4.9.patch
===================================================================
From 25e83c2270b2d2966c992885faed0b79be09f474 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@×××××××××××.net>
Date: Thu, 1 May 2014 11:15:16 -0400
Subject: [PATCH [nfs-utils]] mountd: fix segfault in add_name with newer gcc
 compilers

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 <law@××××××.com>
Cc: Jakub Jelinek <jakub@××××××.com>
Signed-off-by: Jeff Layton <jlayton@×××××××××××.net>
Signed-off-by: Steve Dickson <steved@××××××.com>
---
 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 dbf47b9..f85e11c 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.0.0