From 86086fce66f7c12168c7dfb699fb6dcc5b54a5f2 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 6 Jul 2017 12:53:41 +1000 Subject: [PATCH] fstab-generator: fix new NULL dereference. (#6296) fstype can be NULL, particularly when called from add_sysroot_mount(), so we need to use STRPTR_IN_SET(). --- src/fstab-generator/fstab-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 7688a75f125..ce9dccfe68c 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -358,7 +358,7 @@ static int add_mount( "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", source); - if (STR_IN_SET(fstype, "nfs", "nfs4") && !automount && + if (STRPTR_IN_SET(fstype, "nfs", "nfs4") && !automount && fstab_test_yes_no_option(opts, "bg\0" "fg\0")) { /* The default retry timeout that mount.nfs uses for 'bg' mounts * is 10000 minutes, where as it uses 2 minutes for 'fg' mounts. -- 2.47.3