The patch titled
integrity: don't return a value from void function
has been added to the -mm tree. Its filename is
integrity-service-api-and-dummy-provider-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: integrity: don't return a value from void function
From: "Serge E. Hallyn" <serue@xxxxxxxxxx>
include/linux/integrity.h:integrity_measure() returns void,
but the non-integrity dummy version does 'return 0;'.
Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
Cc: Mimi Zohar <zohar@xxxxxxxxxx>
Cc: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/integrity.h | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN include/linux/integrity.h~integrity-service-api-and-dummy-provider-fix include/linux/integrity.h
--- a/include/linux/integrity.h~integrity-service-api-and-dummy-provider-fix
+++ a/include/linux/integrity.h
@@ -86,7 +86,7 @@ static inline int integrity_verify_data(
static inline void integrity_measure(struct dentry *dentry,
const unsigned char *filename, int mask)
{
- return integrity_ops->measure(dentry, filename, mask);
+ integrity_ops->measure(dentry, filename, mask);
}
#else
static inline int integrity_verify_metadata(struct dentry *dentry,
@@ -107,7 +107,6 @@ static inline int integrity_verify_data(
static inline void integrity_measure(struct dentry *dentry,
const unsigned char *filename, int mask)
{
- return 0;
}
#endif
#endif
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
implement-file-posix-capabilities.patch
file-capabilities-dont-do-file-caps-if-mnt_nosuid.patch
file-capabilities-honor-secure_noroot.patch
nsproxy-externalizes-exit_task_namespaces.patch
user-namespace-add-the-framework.patch
user-namespace-add-the-framework-fix.patch
user-ns-add-user_namespace-ptr-to-vfsmount.patch
user-ns-hook-permission.patch
user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs.patch
user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs-fix.patch
user-ns-implement-shared-mounts.patch
user_ns-handle-file-sigio.patch
user-ns-implement-user-ns-unshare.patch
user-ns-implement-user-ns-unshare-tidy.patch
integrity-service-api-and-dummy-provider-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
