From: Adrian Brunyate <abrunyate@xxxxxxxxx> Signed-off-by: Adrian Brunyate <abrunyate@xxxxxxxxx> Signed-off-by: Josef 'Jeff' Sipek <jsipek@xxxxxxxxxxxxx> --- fs/unionfs/super.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c index ee12d03..02c0cc8 100644 --- a/fs/unionfs/super.c +++ b/fs/unionfs/super.c @@ -442,7 +442,7 @@ static int unionfs_remount_fs(struct super_block *sb, int *flags, * the union to a "ro" or "rw" and the VFS took care of it. So * nothing to do and we're done. */ - if (options[0] == '\0') + if (!options || options[0] == '\0') goto out_error; /* -- 1.5.0.3.1043.g4342 - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html