debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

fs: Consolidate softdep declarations in each module

This commit is contained in:
Ben Hutchings 2016-04-14 19:27:34 +01:00
parent 92f972094e
commit 690df616c2
2 changed files with 55 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ linux (4.5.1-2) UNRELEASED; urgency=medium
[ Salvatore Bonaccorso ]
* [x86] xen: suppress hugetlbfs in PV guests (CVE-2016-3961)
[ Ben Hutchings ]
* fs: Consolidate softdep declarations in each module
-- Salvatore Bonaccorso <carnil@debian.org> Thu, 14 Apr 2016 20:52:28 +0200
linux (4.5.1-1) unstable; urgency=medium

165
debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch vendored
View File

@ -8,137 +8,76 @@ dependencies of a module.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
fs/btrfs/hash.c | 2 ++
fs/cifs/cifsencrypt.c | 2 ++
fs/cifs/link.c | 2 ++
fs/cifs/smb2transport.c | 2 ++
fs/cifs/smbencrypt.c | 2 ++
fs/ext4/crypto_key.c | 2 ++
fs/ext4/super.c | 2 ++
fs/f2fs/crypto_key.c | 2 ++
fs/f2fs/super.c | 2 ++
fs/jbd2/journal.c | 2 ++
fs/nfsd/nfs4recover.c | 2 ++
11 files changed, 22 insertions(+)
--- a/fs/btrfs/hash.c
+++ b/fs/btrfs/hash.c
@@ -13,6 +13,7 @@
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2426,3 +2426,4 @@ late_initcall(init_btrfs_fs);
module_exit(exit_btrfs_fs)
#include <crypto/hash.h>
#include <linux/err.h>
+#include <linux/module.h>
#include "hash.h"
static struct crypto_shash *tfm;
@@ -44,3 +45,5 @@ u32 btrfs_crc32c(u32 crc, const void *ad
return *ctx;
}
+
MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32c");
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -865,3 +865,5 @@ cifs_crypto_shash_release(struct TCP_Ser
kfree(server->secmech.sdescmd5);
server->secmech.sdescmd5 = NULL;
}
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1375,5 +1375,13 @@ MODULE_DESCRIPTION
("VFS to access servers complying with the SNIA CIFS Specification "
"e.g. Samba and Windows");
MODULE_VERSION(CIFS_VERSION);
+
+MODULE_SOFTDEP("pre: crypto-arc4 crypto-ecb crypto-hmac crypto-md5");
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -746,3 +746,5 @@ symlink_exit:
free_xid(xid);
return rc;
}
+#ifdef CONFIG_CIFS_SMB2
+#define CIFS_SMB2_EXTRA_SOFTDEPS " crypto-aes crypto-cmac crypto-sha256"
+#else
+#define CIFS_SMB2_EXTRA_SOFTDEPS ""
+#endif
+MODULE_SOFTDEP("pre: crypto-arc4 crypto-des crypto-ecb crypto-hmac crypto-md4 crypto-md5" CIFS_SMB2_EXTRA_SOFTDEPS);
+
+MODULE_SOFTDEP("pre: crypto-md5");
--- a/fs/cifs/smb2transport.c
+++ b/fs/cifs/smb2transport.c
@@ -700,3 +700,5 @@ smb2_setup_async_request(struct TCP_Serv
return mid;
}
+
+MODULE_SOFTDEP("pre: crypto-aes crypto-cmac crypto-hmac crypto-sha256");
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -247,3 +247,5 @@ SMBNTencrypt(unsigned char *passwd, unsi
rc = E_P24(p21, c8, p24);
return rc;
}
+
+MODULE_SOFTDEP("pre: crypto-des crypto-ecb crypto-md4");
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@ -10,6 +10,7 @@
#include <keys/encrypted-type.h>
#include <keys/user-type.h>
+#include <linux/module.h>
#include <linux/random.h>
#include <linux/scatterlist.h>
#include <uapi/linux/keyctl.h>
@@ -274,3 +275,5 @@ int ext4_has_encryption_key(struct inode
return (ei->i_crypt_info != NULL);
}
+
+MODULE_SOFTDEP("pre: crypto-aes crypto-ecb");
module_init(init_cifs)
module_exit(exit_cifs)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5404,6 +5404,8 @@ static void __exit ext4_exit_fs(void)
ext4_exit_es();
}
+MODULE_SOFTDEP("pre: crypto-crc32c");
+
@@ -5407,5 +5407,13 @@ static void __exit ext4_exit_fs(void)
MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
MODULE_DESCRIPTION("Fourth Extended Filesystem");
MODULE_LICENSE("GPL");
--- a/fs/f2fs/crypto_key.c
+++ b/fs/f2fs/crypto_key.c
@@ -11,6 +11,7 @@
*/
#include <keys/encrypted-type.h>
#include <keys/user-type.h>
+#include <linux/module.h>
#include <linux/random.h>
#include <linux/scatterlist.h>
#include <uapi/linux/keyctl.h>
@@ -252,3 +253,5 @@ int f2fs_has_encryption_key(struct inode
return (fi->i_crypt_info != NULL);
}
+
+MODULE_SOFTDEP("pre: crypto-aes crypto-ecb");
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
+#define EXT4_ENC_EXTRA_SOFTDEPS " crypto-aes crypto-ecb"
+#else
+#define EXT4_ENC_EXTRA_SOFTDEPS ""
+#endif
+MODULE_SOFTDEP("pre: crypto-crc32c" EXT4_ENC_EXTRA_SOFTDEPS);
+
module_init(ext4_init_fs)
module_exit(ext4_exit_fs)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1640,6 +1640,8 @@ static void __exit exit_f2fs_fs(void)
f2fs_destroy_trace_ios();
}
+MODULE_SOFTDEP("pre: crypto-crc32c");
@@ -1646,3 +1646,10 @@ module_exit(exit_f2fs_fs)
MODULE_AUTHOR("Samsung Electronics's Praesto Team");
MODULE_DESCRIPTION("Flash Friendly File System");
MODULE_LICENSE("GPL");
+
module_init(init_f2fs_fs)
module_exit(exit_f2fs_fs)
+#ifdef CONFIG_F2FS_FS_ENCRYPTION
+#define F2FS_ENC_EXTRA_SOFTDEPS " crypto-aes crypto-ecb"
+#else
+#define F2FS_ENC_EXTRA_SOFTDEPS ""
+#endif
+MODULE_SOFTDEP("pre: crypto-crc32c" F2FS_ENC_EXTRA_SOFTDEPS);
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2693,6 +2693,8 @@ static void __exit journal_exit(void)
jbd2_journal_destroy_caches();
@@ -2694,6 +2694,7 @@ static void __exit journal_exit(void)
}
+MODULE_SOFTDEP("pre: crypto-crc32c");
+
MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32c");
module_init(journal_init);
module_exit(journal_exit);
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1553,3 +1553,5 @@ unregister_cld_notifier(void)
{
rpc_pipefs_notifier_unregister(&nfsd4_cld_block);
}
+
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1314,5 +1314,8 @@ static void __exit exit_nfsd(void)
MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
MODULE_LICENSE("GPL");
+#ifdef CONFIG_NFSD_V4
+MODULE_SOFTDEP("pre: crypto-md5");
+#endif
module_init(init_nfsd)
module_exit(exit_nfsd)