From 556cc634641342e789b42773e7beacd3b8f959e0 Mon Sep 17 00:00:00 2001 From: Zhihao Cheng Date: Sun, 26 Jan 2025 14:42:03 +0800 Subject: ubifs-utils: libubifs: Update source files from linux kernel 6.13-rc7 Update source files from linux kernel 6.13-rc7 aa22f4da2a46. Following changes since 6.8-rc2 41bccc98fb7931d63: 1) 60f16e912a53a ("ubifs: fix sort function prototype") 2) ec724e534dfdd ("ubifs: fix function pointer cast warnings") 3) 39986148bc2ab ("ubifs: fix kernel-doc warnings") 4) 94f5b1571ec8d ("ubifs: Convert to use ERR_CAST()") 5) 4617fb8fc15ef ("ubifs: authentication: Fix use-after-free in ubifs_tnc_end_commit") Signed-off-by: Zhihao Cheng Signed-off-by: David Oberhollenzer --- ubifs-utils/libubifs/tnc_commit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ubifs-utils/libubifs/tnc_commit.c') diff --git a/ubifs-utils/libubifs/tnc_commit.c b/ubifs-utils/libubifs/tnc_commit.c index d797006..66922d4 100644 --- a/ubifs-utils/libubifs/tnc_commit.c +++ b/ubifs-utils/libubifs/tnc_commit.c @@ -663,6 +663,8 @@ static int get_znodes_to_commit(struct ubifs_info *c) znode->alt = 0; cnext = find_next_dirty(znode); if (!cnext) { + ubifs_assert(c, !znode->parent); + znode->cparent = NULL; znode->cnext = c->cnext; break; } -- cgit v1.2.3