Skip to content

Commit cc41a53

Browse files
ubifs: Use a random number for cookies
Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent 528e3d1 commit cc41a53

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

fs/ubifs/journal.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
589589
dent->nlen = cpu_to_le16(fname_len(nm));
590590
memcpy(dent->name, fname_name(nm), fname_len(nm));
591591
dent->name[fname_len(nm)] = '\0';
592+
dent->cookie = prandom_u32();
592593

593594
zero_dent_node_unused(dent);
594595
ubifs_prep_grp_node(c, dent, dlen, 0);
@@ -1124,6 +1125,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
11241125
dent->nlen = cpu_to_le16(fname_len(new_nm));
11251126
memcpy(dent->name, fname_name(new_nm), fname_len(new_nm));
11261127
dent->name[fname_len(new_nm)] = '\0';
1128+
dent->cookie = prandom_u32();
11271129
zero_dent_node_unused(dent);
11281130
ubifs_prep_grp_node(c, dent, dlen1, 0);
11291131

@@ -1142,6 +1144,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
11421144
dent2->nlen = cpu_to_le16(fname_len(old_nm));
11431145
memcpy(dent2->name, fname_name(old_nm), fname_len(old_nm));
11441146
dent2->name[fname_len(old_nm)] = '\0';
1147+
dent2->cookie = prandom_u32();
11451148
zero_dent_node_unused(dent2);
11461149
ubifs_prep_grp_node(c, dent2, dlen2, 0);
11471150

fs/ubifs/ubifs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <linux/security.h>
4040
#include <linux/xattr.h>
4141
#include <linux/fscrypto.h>
42+
#include <linux/random.h>
4243
#include "ubifs-media.h"
4344

4445
/* Version of this UBIFS implementation */

0 commit comments

Comments
 (0)