From 6bb676e6e47b3cd36df5e498b7487044a3b41784 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 27 Jan 2016 10:31:00 +0100 Subject: nfs-utils: drop the bbappend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch has been backported from master onto dizzy-enea, so it becomes redundant when switching to master. Signed-off-by: Adrian Dudau Signed-off-by: Nora Björklund --- .../nfs-utils/fix-segfault-in-add_name.patch | 59 ---------------------- .../nfs-utils/nfs-utils_1.3.0.bbappend | 5 -- 2 files changed, 64 deletions(-) delete mode 100644 recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch delete mode 100644 recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bbappend (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch b/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch deleted file mode 100644 index 4ebf2dc..0000000 --- a/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 25e83c2270b2d2966c992885faed0b79be09f474 -Author: Jeff Layton -Date: Thu May 1 11:15:16 2014 -0400 - - 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 - Cc: Jakub Jelinek - Signed-off-by: Jeff Layton - Signed-off-by: Steve Dickson - - Upstream-Status:Backport - Signed-off-by: Tudor Florea - -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); diff --git a/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bbappend deleted file mode 100644 index 7c9faf0..0000000 --- a/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://fix-segfault-in-add_name.patch \ -" -- cgit v1.2.3-54-g00ecf