Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 78 insertions, 0 deletions

diff --git a/security/keys/compat.c b/security/keys/compat.c
new file mode 100644
index 000000000000..aff8b22dcb5c
--- /dev/null
+++ b/security/keys/compat.c
@@ -0,0 +1,78 @@
+/* compat.c: 32-bit compatibility syscall for 64-bit systems
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/sched.h>
+#include <linux/syscalls.h>
+#include <linux/keyctl.h>
+#include <linux/compat.h>
+#include "internal.h"
+
+/*****************************************************************************/
+/*
+ * the key control system call, 32-bit compatibility version for 64-bit archs
+ * - this should only be called if the 64-bit arch uses weird pointers in
+ *   32-bit mode or doesn't guarantee that the top 32-bits of the argument
+ *   registers on taking a 32-bit syscall are zero
+ * - if you can, you should call sys_keyctl directly
+ */
+asmlinkage long compat_sys_keyctl(u32 option,
+                              u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+{
+        switch (option) {
+        case KEYCTL_GET_KEYRING_ID:
+                return keyctl_get_keyring_ID(arg2, arg3);
+
+        case KEYCTL_JOIN_SESSION_KEYRING:
+                return keyctl_join_session_keyring(compat_ptr(arg2));
+
+        case KEYCTL_UPDATE:
+                return keyctl_update_key(arg2, compat_ptr(arg3), arg4);
+
+        case KEYCTL_REVOKE:
+                return keyctl_revoke_key(arg2);
+
+        case KEYCTL_DESCRIBE:
+                return keyctl_describe_key(arg2, compat_ptr(arg3), arg4);
+
+        case KEYCTL_CLEAR:
+                return keyctl_keyring_clear(arg2);
+
+        case KEYCTL_LINK:
+                return keyctl_keyring_link(arg2, arg3);
+
+        case KEYCTL_UNLINK:
+                return keyctl_keyring_unlink(arg2, arg3);
+
+        case KEYCTL_SEARCH:
+                return keyctl_keyring_search(arg2, compat_ptr(arg3),
+                                             compat_ptr(arg4), arg5);
+
+        case KEYCTL_READ:
+                return keyctl_read_key(arg2, compat_ptr(arg3), arg4);
+
+        case KEYCTL_CHOWN:
+                return keyctl_chown_key(arg2, arg3, arg4);
+
+        case KEYCTL_SETPERM:
+                return keyctl_setperm_key(arg2, arg3);
+
+        case KEYCTL_INSTANTIATE:
+                return keyctl_instantiate_key(arg2, compat_ptr(arg3), arg4,
+                                              arg5);
+
+        case KEYCTL_NEGATE:
+                return keyctl_negate_key(arg2, arg3, arg4);
+
+        default:
+                return -EOPNOTSUPP;
+        }
+
+} /* end compat_sys_keyctl() */