nvme-pci: return error when parsing a quirk string fails
PATCH 3/4 nvme-pci: return error when parsing a quirk string fails
quirks_param_set() reuses 'err', which param_set_copystring() left as 0, as the return value of the whole function. When nvme_parse_quirk_entry() fails to parse a field, the code jumps to out_free_qlist and returns that stale 0, so a malformed quirks= parameter is silently accepted as valid.
Set err to -EINVAL before jumping out on a parse failure.
--- drivers/nvme/host/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/host/pci.c +1 -0
@@ -213,6 +213,7 @@ static int quirks_param_set(const char *value, const struct kernel_param *kp)if (nvme_parse_quirk_entry (field, &qlist[i])) {pr_err ("nvme: failed to parse quirk string %s\n" , value); + err = -EINVAL ; goto out_free_qlist; }
Signature · 1 line
2.43.7
Quoted 6 lines · Guixin Liu
quirks_param_set()reuses 'err', whichparam_set_copystring()left as 0, as the return value of the whole function. Whennvme_parse_quirk_entry()fails to parse a field, the code jumps toout_free_qlistand returns that stale 0, so a malformed quirks= parameter is silently accepted as valid.Set err to
-EINVALbefore jumping out on a parse failure.
Looks good:
Quoted 9 lines · Guixin Liu
quirks_param_set()reuses 'err', whichparam_set_copystring()left as 0, as the return value of the whole function. Whennvme_parse_quirk_entry()fails to parse a field, the code jumps toout_free_qlistand returns that stale 0, so a malformed quirks= parameter is silently accepted as valid.Set err to
-EINVALbefore jumping out on a parse failure.Fixes 7bb8c40f5ad8 ("nvme: add support for dynamic quirk configuration via module parameter")Signed-off-by Guixin Liu <[email protected]>
Looks good.