Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'edac_urgent_for_v6.9_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fixes from Borislav Petkov:
- Fix error logging and check user-supplied data when injecting an
error in the versal EDAC driver
* tag 'edac_urgent_for_v6.9_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/versal: Do not log total error counts
EDAC/versal: Check user-supplied data before injecting an error
EDAC/versal: Do not register for NOC errors
+6
-6
+6
-6
drivers/edac/versal_edac.c
+6
-6
drivers/edac/versal_edac.c
···
425
425
convert_to_physical(priv, pinf), pinf.burstpos);
426
426
427
427
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
428
-
priv->ce_cnt, 0, 0, 0, 0, 0, -1,
428
+
1, 0, 0, 0, 0, 0, -1,
429
429
priv->message, "");
430
430
}
431
431
···
438
438
convert_to_physical(priv, pinf), pinf.burstpos);
439
439
440
440
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
441
-
priv->ue_cnt, 0, 0, 0, 0, 0, -1,
441
+
1, 0, 0, 0, 0, 0, -1,
442
442
priv->message, "");
443
443
}
444
444
···
865
865
for (i = 0; i < NUM_UE_BITPOS; i++)
866
866
token[i] = strsep(&pbuf, ",");
867
867
868
+
if (!token[0] || !token[1])
869
+
return -EFAULT;
870
+
868
871
ret = kstrtou8(token[0], 0, &ue0);
869
872
if (ret)
870
873
return ret;
···
1138
1135
}
1139
1136
1140
1137
rc = xlnx_register_event(PM_NOTIFY_CB, VERSAL_EVENT_ERROR_PMC_ERR1,
1141
-
XPM_EVENT_ERROR_MASK_DDRMC_CR | XPM_EVENT_ERROR_MASK_DDRMC_NCR |
1142
-
XPM_EVENT_ERROR_MASK_NOC_CR | XPM_EVENT_ERROR_MASK_NOC_NCR,
1138
+
XPM_EVENT_ERROR_MASK_DDRMC_CR | XPM_EVENT_ERROR_MASK_DDRMC_NCR,
1143
1139
false, err_callback, mci);
1144
1140
if (rc) {
1145
1141
if (rc == -EACCES)
···
1175
1173
1176
1174
xlnx_unregister_event(PM_NOTIFY_CB, VERSAL_EVENT_ERROR_PMC_ERR1,
1177
1175
XPM_EVENT_ERROR_MASK_DDRMC_CR |
1178
-
XPM_EVENT_ERROR_MASK_NOC_CR |
1179
-
XPM_EVENT_ERROR_MASK_NOC_NCR |
1180
1176
XPM_EVENT_ERROR_MASK_DDRMC_NCR, err_callback, mci);
1181
1177
edac_mc_del_mc(&pdev->dev);
1182
1178
edac_mc_free(mci);