diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:25:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:25:02 -0700 |
| commit | 820c687b70ae2c72972240b83c053cb7c85ddbc3 (patch) | |
| tree | 8a144e528f287c3e05ba97a60ade45be91f6255c /include | |
| parent | Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy (diff) | |
| parent | udf: Export superblock magic to userspace (diff) | |
| download | linux-dev-820c687b70ae2c72972240b83c053cb7c85ddbc3.tar.xz linux-dev-820c687b70ae2c72972240b83c053cb7c85ddbc3.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF fixes from Jan Kara:
"A fix for UDF crash on corrupted media and one UDF header fixup"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Export superblock magic to userspace
udf: Prevent stack overflow on corrupted filesystem mount
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/magic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 0de181ad73d5..546b38886e11 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -78,5 +78,7 @@ #define BTRFS_TEST_MAGIC 0x73727279 #define NSFS_MAGIC 0x6e736673 #define BPF_FS_MAGIC 0xcafe4a11 +/* Since UDF 2.01 is ISO 13346 based... */ +#define UDF_SUPER_MAGIC 0x15013346 #endif /* __LINUX_MAGIC_H__ */ |