summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/nfs-utils
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2016-01-15 16:17:43 (GMT)
committerAdrian Dudau <adrian.dudau@enea.com>2016-01-15 16:17:43 (GMT)
commit791bb999eef6da39d2160701f7d308e86113eefd (patch)
treef4ca859a22b4e29f527f51c05b742b1968e9b6c8 /meta/recipes-connectivity/nfs-utils
parentcc1d3f0edb1a8d2bdd24aa34c654c2135e0854fe (diff)
downloadpoky-791bb999eef6da39d2160701f7d308e86113eefd.tar.gz
initial commit for Enea Linux 5.0-ppc
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch59
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch
new file mode 100644
index 0000000..4ebf2dc
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch
@@ -0,0 +1,59 @@
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/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 6e6d09b..dcdb35e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -31,6 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
31 file://nfs-statd.service \ 31 file://nfs-statd.service \
32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
33 file://0001-statd-fixed-the-with-statdpath-flag.patch \ 33 file://0001-statd-fixed-the-with-statdpath-flag.patch \
34 file://fix-segfault-in-add_name.patch \
34" 35"
35 36
36SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" 37SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"