From 5b160549582fe3cd852ce501570232a1cc227338 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 26 Aug 2016 12:53:31 +0200 Subject: [PATCH] btrfs-progs: scrub: improved error handling in scrub_read_file Signed-off-by: David Sterba --- cmds-scrub.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmds-scrub.c b/cmds-scrub.c index c03bc5fb..2cf7f308 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -481,7 +481,10 @@ static struct scrub_file_record **scrub_read_file(int fd, int report_errors) again: old_avail = avail - i; - BUG_ON(old_avail < 0); + if (old_avail < 0) { + error("scrub record file corrupted near byte %d", i); + return ERR_PTR(-EINVAL); + } if (old_avail) memmove(l, l + i, old_avail); avail = read(fd, l + old_avail, sizeof(l) - old_avail); @@ -650,7 +653,9 @@ skip: } while (i < avail); continue; } - BUG(); + error("internal error: unknown parser state %d near byte %d", + state, i); + return ERR_PTR(-EINVAL); } goto again; }