We mount efivarfs fail after pstore generated 'dump-type*' variables and reboot. This issue introduced by commit 47f531e8ba3bc3901a0c493f4252826c41dea1a1 (efivarfs: Validate filenames much more aggressively) The pstore variable is 'dump-type*-*-*-*-GUID'style, it could not pass the "GUID should be right after the first '-'" check. This patch allow the variable name that has 'dump-type' pass the name check. Cc: Matt Fleming <matt.fleming@xxxxxxxxx> Cc: Seiji Aguchi <seiji.aguchi@xxxxxxx> Cc: Matthew Garrett <mjg59@xxxxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Lingzhu Xiang <lxiang@xxxxxxxxxx> Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxx> --- drivers/firmware/efivars.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 3edade0..ab07f7f 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -930,7 +930,7 @@ static bool efivarfs_valid_name(const char *str, int len) return false; /* GUID should be right after the first '-' */ - if (s - 1 != strchr(str, '-')) + if (s - 1 != strchr(str, '-') && !strstarts(str, "dump-type")) return false; /* -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
