diff mbox series

[-next] ext4: Fix access uninitialized 'retval' in kmmpd

Message ID 20210713022728.2533770-1-yebin10@huawei.com
State Awaiting Upstream
Headers show
Series [-next] ext4: Fix access uninitialized 'retval' in kmmpd | expand

Commit Message

yebin (H) July 13, 2021, 2:27 a.m. UTC
If (!ext4_has_feature_mmp(sb)) then goto 'wait_to_exit' label, but
retval not be uninitialized.

Fixes: 61bb4a1c417e ("ext4: fix possible UAF when remounting r/o a mmp-protected file system")
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
 fs/ext4/mmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o July 23, 2021, 11:31 a.m. UTC | #1
On Tue, Jul 13, 2021 at 10:27:28AM +0800, Ye Bin wrote:
> If (!ext4_has_feature_mmp(sb)) then goto 'wait_to_exit' label, but
> retval not be uninitialized.
> 
> Fixes: 61bb4a1c417e ("ext4: fix possible UAF when remounting r/o a mmp-protected file system")
> Signed-off-by: Ye Bin <yebin10@huawei.com>

Thanks, applied with a slightly fixed up commit description.

					- Ted
diff mbox series

Patch

diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index bc364c119af6..cebea4270817 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -138,7 +138,7 @@  static int kmmpd(void *data)
 	unsigned mmp_check_interval;
 	unsigned long last_update_time;
 	unsigned long diff;
-	int retval;
+	int retval = 0;
 
 	mmp_block = le64_to_cpu(es->s_mmp_block);
 	mmp = (struct mmp_struct *)(bh->b_data);