From 0d7012faab2f69f508a13fdb41fad0a41c7fdc37 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 11 May 2015 21:58:02 +0200 Subject: [PATCH] platform/test: fix valgrind warning about NULL arguments to mount() ==21573== Syscall param mount(type) points to unaddressable byte(s) ==21573== at 0x854B9BA: mount (syscall-template.S:81) ==21573== by 0x158922: main (test-common.c:295) ==21573== Address 0x0 is not stack'd, malloc'd or (recently) free'd ==21573== { Memcheck:Param mount(type) fun:mount fun:main } Fixes: d6aef9c188468224d6e1dd670844c3f0e7482c35 --- src/platform/tests/test-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index bb94debc78..aced280575 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -292,7 +292,7 @@ main (int argc, char **argv) /* Mount our /sys instance, so that gudev sees only our devices. * Needs to be read-only, because we don't run udev. */ - if (mount (NULL, "/sys", NULL, MS_SLAVE, NULL) != 0) { + if (mount (NULL, "/sys", "sysfs", MS_SLAVE, NULL) != 0) { errsv = errno; g_error ("mount(\"/\", MS_SLAVE) failed with %s (%d)", strerror (errsv), errsv); } @@ -311,7 +311,7 @@ main (int argc, char **argv) errsv = errno; g_error ("remount(\"/sys/devices\") failed with %s (%d)", strerror (errsv), errsv); } - if (mount ("/sys/devices/devices", "/sys/devices", NULL, MS_BIND, NULL) != 0) { + if (mount ("/sys/devices/devices", "/sys/devices", "sysfs", MS_BIND, NULL) != 0) { errsv = errno; g_error ("mount(\"/sys\") failed with %s (%d)", strerror (errsv), errsv); }