Skip to content

block: fix infinite loop in badblocks_clear() #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+8 −0
Open

block: fix infinite loop in badblocks_clear() #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions block/badblocks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,10 @@ static bool _badblocks_clear(struct badblocks *bb, sector_t s, sector_t sectors)
/* Not front overlap, but behind overlap */
if ((prev + 1) < bb->count && overlap_behind(bb, &bad, prev + 1)) {
len = BB_OFFSET(p[prev + 1]) - bad.start;
if (len == 0) {
pr_warn_once("badblocks_clear: zero-length segment detected\n");
len = 1;
}
hint = prev + 1;
/* Clear non-bad range should be treated as successful */
cleared++;
Expand Down Expand Up @@ -1234,6 +1238,10 @@ static int _badblocks_check(struct badblocks *bb, sector_t s, sector_t sectors,
/* Not front overlap, but behind overlap */
if ((prev + 1) < bb->count && overlap_behind(bb, &bad, prev + 1)) {
len = BB_OFFSET(p[prev + 1]) - bad.start;
if (len == 0) {
pr_warn_once("badblocks_check: zero-length segment detected\n");
len = 1;
}
hint = prev + 1;
goto update_sectors;
}
Expand Down