Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60996 )
Change subject: linux_mtd: check ioctl() return value properly ......................................................................
linux_mtd: check ioctl() return value properly
Make the linux_mtd driver treat any negative return value from the MEMERASE ioctl as an error. Previously it only treated -1 as an error.
BUG=b:213561594,b:210973586,b:182223106 BRANCH=none TEST=builds
Change-Id: I40cfbdee2ab608fbe6c17d9cac6ec53ff224d9a4 Signed-off-by: Nikolai Artemiev nartemiev@google.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/60996 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Edward O'Callaghan quasisec@chromium.org --- M linux_mtd.c 1 file changed, 5 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/linux_mtd.c b/linux_mtd.c index 04eccde..9d80a51 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -286,9 +286,11 @@ .length = data->erasesize, };
- if (ioctl(fileno(data->dev_fp), MEMERASE, &erase_info) == -1) { - msg_perr("%s: ioctl: %s\n", __func__, strerror(errno)); - return 1; + int ret = ioctl(fileno(data->dev_fp), MEMERASE, &erase_info); + if (ret < 0) { + msg_perr("%s: MEMERASE ioctl call returned %d, error: %s\n", + __func__, ret, strerror(errno)); + return 1; } }
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.