diff options
| author | zhanchengbin <zhanchengbin1@huawei.com> | 2021-12-31 15:43:10 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-05-11 20:56:42 -0400 |
| commit | fdec633fd661e79b7b81e848b5699775328d70ae (patch) | |
| tree | 18b5a7b242d94016bc12cc1ca0e21b14dc2d327d | |
| parent | ba18f6efec62a1706b4bcf8fffd27611022260b8 (diff) | |
| download | e2fsprogs-fdec633fd661e79b7b81e848b5699775328d70ae.tar.gz | |
e2fsck: avoid theoretical null dereference in end_problem_latch()
This should only happen if there is a programming bug, but better safe
than sorry.
Link: https://lore.kernel.org/r/9a9c6658-a8b3-794a-85df-c3bdf0470111@huawei.com
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | e2fsck/problem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 46a74273e..95f0ace88 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -2321,6 +2321,8 @@ int end_problem_latch(e2fsck_t ctx, int mask) int answer = -1; ldesc = find_latch(mask); + if (!ldesc) + return answer; if (ldesc->end_message && (ldesc->flags & PRL_LATCHED)) { clear_problem_context(&pctx); answer = fix_problem(ctx, ldesc->end_message, &pctx); @@ -2467,8 +2469,8 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx) * Do special latch processing. This is where we ask the * latch question, if it exists */ - if (ptr->flags & PR_LATCH_MASK) { - ldesc = find_latch(ptr->flags & PR_LATCH_MASK); + if (ptr->flags & PR_LATCH_MASK && + (ldesc = find_latch(ptr->flags & PR_LATCH_MASK)) != NULL) { if (ldesc->question && !(ldesc->flags & PRL_LATCHED)) { ans = fix_problem(ctx, ldesc->question, pctx); if (ans == 1) |