History

Merge tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs

Pull UBIFS updates from Richard Weinberger: - Full filesystem authentication feature, UBIFS is now able to have the whole filesystem structure authenticated plus user data encrypted and authenticated. - Minor cleanups * tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs: (26 commits) ubifs: Remove unneeded semicolon Documentation: ubifs: Add authentication whitepaper ubifs: Enable authentication support ubifs: Do not update inode size in-place in authenticated mode ubifs: Add hashes and HMACs to default filesystem ubifs: authentication: Authenticate super block node ubifs: Create hash for default LPT ubfis: authentication: Authenticate master node ubifs: authentication: Authenticate LPT ubifs: Authenticate replayed journal ubifs: Add auth nodes to garbage collector journal head ubifs: Add authentication nodes to journal ubifs: authentication: Add hashes to index nodes ubifs: Add hashes to the tree node cache ubifs: Create functions to embed a HMAC in a node ubifs: Add helper functions for authentication support ubifs: Add separate functions to init/crc a node ubifs: Format changes for authentication support ubifs: Store read superblock node ubifs: Drop write_node ...

Linus Torvalds committed 8 years ago

Commit 42bd06e2 parents 4710e78 84db11925 files · +2418 −292Browse files

Showing the changes to drivers (2 of 25 files). Show all

Unified · Split

2 files
  1. drivers/mtd/ubi/attach.c +1 −0
  2. drivers/mtd/ubi/build.c +2 −0
drivers/mtd/ubi/attach.c+1−0
@@ -1072,6 +1072,7 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai, · 1071 unmodified lines
1072 * be a result of power cut during erasure.1072 * be a result of power cut during erasure.
1073 */1073 */
1074 ai->maybe_bad_peb_count += 1;1074 ai->maybe_bad_peb_count += 1;
1075 /* fall through */
1075 case UBI_IO_BAD_HDR:1076 case UBI_IO_BAD_HDR:
1076 /*1077 /*
1077 * If we're facing a bad VID header we have to drop *all*1078 * If we're facing a bad VID header we have to drop *all*
drivers/mtd/ubi/build.c+2−0
@@ -1334,8 +1334,10 @@ static int bytes_str_to_int(const char *str) · 1333 unmodified lines
1334 switch (*endp) {1334 switch (*endp) {
1335 case 'G':1335 case 'G':
1336 result *= 1024;1336 result *= 1024;
1337 /* fall through */
1337 case 'M':1338 case 'M':
1338 result *= 1024;1339 result *= 1024;
1340 /* fall through */
1339 case 'K':1341 case 'K':
1340 result *= 1024;1342 result *= 1024;
1341 if (endp[1] == 'i' && endp[2] == 'B')1343 if (endp[1] == 'i' && endp[2] == 'B')