diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2025-01-26 14:42:03 +0800 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2025-01-30 18:30:17 +0100 |
| commit | 556cc634641342e789b42773e7beacd3b8f959e0 (patch) | |
| tree | bcb971d2df952950a8e771bf8b83b5b07010f063 /ubifs-utils/libubifs/lpt_commit.c | |
| parent | 99614daab640927a6061c99fd17a9c22a66c405d (diff) | |
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 <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'ubifs-utils/libubifs/lpt_commit.c')
| -rw-r--r-- | ubifs-utils/libubifs/lpt_commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ubifs-utils/libubifs/lpt_commit.c b/ubifs-utils/libubifs/lpt_commit.c index ee84f80..79f7b14 100644 --- a/ubifs-utils/libubifs/lpt_commit.c +++ b/ubifs-utils/libubifs/lpt_commit.c @@ -580,7 +580,7 @@ struct ubifs_pnode *ubifs_find_next_pnode(struct ubifs_info *c, /* Go right */ nnode = ubifs_get_nnode(c, nnode, iip); if (IS_ERR(nnode)) - return (void *)nnode; + return ERR_CAST(nnode); /* Go down to level 1 */ while (nnode->level > 1) { @@ -597,7 +597,7 @@ struct ubifs_pnode *ubifs_find_next_pnode(struct ubifs_info *c, } nnode = ubifs_get_nnode(c, nnode, iip); if (IS_ERR(nnode)) - return (void *)nnode; + return ERR_CAST(nnode); } for (iip = 0; iip < UBIFS_LPT_FANOUT; iip++) |