summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2016-01-27 10:31:00 +0100
committerNora Björklund <nora.bjorklund@enea.com>2016-01-28 12:37:24 +0100
commit6bb676e6e47b3cd36df5e498b7487044a3b41784 (patch)
treefaaeb64a0793197b213275833f21b228ba829d21
parent32bee1d3e66c17bf2cedfbd19e658a767db81c82 (diff)
downloadmeta-el-common-6bb676e6e47b3cd36df5e498b7487044a3b41784.tar.gz
nfs-utils: drop the bbappend
The patch has been backported from master onto dizzy-enea, so it becomes redundant when switching to master. Signed-off-by: Adrian Dudau <adrian.dudau@enea.com> Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>
-rw-r--r--recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch59
-rw-r--r--recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bbappend5
2 files changed, 0 insertions, 64 deletions
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 @@
1commit 25e83c2270b2d2966c992885faed0b79be09f474
2Author: Jeff Layton <jlayton@poochiereds.net>
3Date: Thu May 1 11:15:16 2014 -0400
4
5 mountd: fix segfault in add_name with newer gcc compilers
6
7 I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
8 NULL pointer checks got reordered such that a pointer was dereferenced
9 before checking to see whether it was NULL. The problem was due to
10 nfs-utils relying on undefined behavior, which tricked gcc into assuming
11 that the pointer would never be NULL.
12
13 At first I assumed that this was a compiler bug, but Jakub Jelinek and
14 Jeff Law pointed out:
15
16 "If old is NULL, then:
17
18 strncpy(new, old, cp-old);
19
20 is undefined behavior (even when cp == old == NULL in that case),
21 therefore gcc assumes that old is never NULL, as otherwise it would be
22 invalid.
23
24 Just guard
25 strncpy(new, old, cp-old);
26 new[cp-old] = 0;
27 with if (old) { ... }."
28
29 This patch does that. If old is NULL though, then we still need to
30 ensure that new is NULL terminated, lest the subsequent strcats walk off
31 the end of it.
32
33 Cc: Jeff Law <law@redhat.com>
34 Cc: Jakub Jelinek <jakub@redhat.com>
35 Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
36 Signed-off-by: Steve Dickson <steved@redhat.com>
37
38 Upstream-Status:Backport
39 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
40
41diff --git a/support/export/client.c b/support/export/client.c
42index dbf47b9..f85e11c 100644
43--- a/support/export/client.c
44+++ b/support/export/client.c
45@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
46 else
47 cp = cp + strlen(cp);
48 }
49- strncpy(new, old, cp-old);
50- new[cp-old] = 0;
51+ if (old) {
52+ strncpy(new, old, cp-old);
53+ new[cp-old] = 0;
54+ } else {
55+ new[0] = 0;
56+ }
57 if (cp != old && !*cp)
58 strcat(new, ",");
59 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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3SRC_URI += " \
4 file://fix-segfault-in-add_name.patch \
5"