~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/security/keys/compat.c

Version: ~ [ linux-6.11-rc3 ] ~ [ linux-6.10.4 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.45 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.104 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.164 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.223 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.281 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.319 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.9 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /security/keys/compat.c (Version linux-6.11-rc3) and /security/keys/compat.c (Version linux-4.11.12)


  1 // SPDX-License-Identifier: GPL-2.0-or-later   << 
  2 /* 32-bit compatibility syscall for 64-bit sys      1 /* 32-bit compatibility syscall for 64-bit systems
  3  *                                                  2  *
  4  * Copyright (C) 2004-5 Red Hat, Inc. All Righ      3  * Copyright (C) 2004-5 Red Hat, Inc. All Rights Reserved.
  5  * Written by David Howells (dhowells@redhat.c      4  * Written by David Howells (dhowells@redhat.com)
                                                   >>   5  *
                                                   >>   6  * This program is free software; you can redistribute it and/or
                                                   >>   7  * modify it under the terms of the GNU General Public License
                                                   >>   8  * as published by the Free Software Foundation; either version
                                                   >>   9  * 2 of the License, or (at your option) any later version.
  6  */                                                10  */
  7                                                    11 
  8 #include <linux/syscalls.h>                        12 #include <linux/syscalls.h>
  9 #include <linux/keyctl.h>                          13 #include <linux/keyctl.h>
 10 #include <linux/compat.h>                          14 #include <linux/compat.h>
 11 #include <linux/slab.h>                            15 #include <linux/slab.h>
 12 #include "internal.h"                              16 #include "internal.h"
 13                                                    17 
 14 /*                                                 18 /*
                                                   >>  19  * Instantiate a key with the specified compatibility multipart payload and
                                                   >>  20  * link the key into the destination keyring if one is given.
                                                   >>  21  *
                                                   >>  22  * The caller must have the appropriate instantiation permit set for this to
                                                   >>  23  * work (see keyctl_assume_authority).  No other permissions are required.
                                                   >>  24  *
                                                   >>  25  * If successful, 0 will be returned.
                                                   >>  26  */
                                                   >>  27 static long compat_keyctl_instantiate_key_iov(
                                                   >>  28         key_serial_t id,
                                                   >>  29         const struct compat_iovec __user *_payload_iov,
                                                   >>  30         unsigned ioc,
                                                   >>  31         key_serial_t ringid)
                                                   >>  32 {
                                                   >>  33         struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
                                                   >>  34         struct iov_iter from;
                                                   >>  35         long ret;
                                                   >>  36 
                                                   >>  37         if (!_payload_iov)
                                                   >>  38                 ioc = 0;
                                                   >>  39 
                                                   >>  40         ret = compat_import_iovec(WRITE, _payload_iov, ioc,
                                                   >>  41                                   ARRAY_SIZE(iovstack), &iov,
                                                   >>  42                                   &from);
                                                   >>  43         if (ret < 0)
                                                   >>  44                 return ret;
                                                   >>  45 
                                                   >>  46         ret = keyctl_instantiate_key_common(id, &from, ringid);
                                                   >>  47         kfree(iov);
                                                   >>  48         return ret;
                                                   >>  49 }
                                                   >>  50 
                                                   >>  51 /*
 15  * The key control system call, 32-bit compati     52  * The key control system call, 32-bit compatibility version for 64-bit archs
                                                   >>  53  *
                                                   >>  54  * This should only be called if the 64-bit arch uses weird pointers in 32-bit
                                                   >>  55  * mode or doesn't guarantee that the top 32-bits of the argument registers on
                                                   >>  56  * taking a 32-bit syscall are zero.  If you can, you should call sys_keyctl()
                                                   >>  57  * directly.
 16  */                                                58  */
 17 COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,        59 COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,
 18                        u32, arg2, u32, arg3, u     60                        u32, arg2, u32, arg3, u32, arg4, u32, arg5)
 19 {                                                  61 {
 20         switch (option) {                          62         switch (option) {
 21         case KEYCTL_GET_KEYRING_ID:                63         case KEYCTL_GET_KEYRING_ID:
 22                 return keyctl_get_keyring_ID(a     64                 return keyctl_get_keyring_ID(arg2, arg3);
 23                                                    65 
 24         case KEYCTL_JOIN_SESSION_KEYRING:          66         case KEYCTL_JOIN_SESSION_KEYRING:
 25                 return keyctl_join_session_key     67                 return keyctl_join_session_keyring(compat_ptr(arg2));
 26                                                    68 
 27         case KEYCTL_UPDATE:                        69         case KEYCTL_UPDATE:
 28                 return keyctl_update_key(arg2,     70                 return keyctl_update_key(arg2, compat_ptr(arg3), arg4);
 29                                                    71 
 30         case KEYCTL_REVOKE:                        72         case KEYCTL_REVOKE:
 31                 return keyctl_revoke_key(arg2)     73                 return keyctl_revoke_key(arg2);
 32                                                    74 
 33         case KEYCTL_DESCRIBE:                      75         case KEYCTL_DESCRIBE:
 34                 return keyctl_describe_key(arg     76                 return keyctl_describe_key(arg2, compat_ptr(arg3), arg4);
 35                                                    77 
 36         case KEYCTL_CLEAR:                         78         case KEYCTL_CLEAR:
 37                 return keyctl_keyring_clear(ar     79                 return keyctl_keyring_clear(arg2);
 38                                                    80 
 39         case KEYCTL_LINK:                          81         case KEYCTL_LINK:
 40                 return keyctl_keyring_link(arg     82                 return keyctl_keyring_link(arg2, arg3);
 41                                                    83 
 42         case KEYCTL_UNLINK:                        84         case KEYCTL_UNLINK:
 43                 return keyctl_keyring_unlink(a     85                 return keyctl_keyring_unlink(arg2, arg3);
 44                                                    86 
 45         case KEYCTL_SEARCH:                        87         case KEYCTL_SEARCH:
 46                 return keyctl_keyring_search(a     88                 return keyctl_keyring_search(arg2, compat_ptr(arg3),
 47                                              c     89                                              compat_ptr(arg4), arg5);
 48                                                    90 
 49         case KEYCTL_READ:                          91         case KEYCTL_READ:
 50                 return keyctl_read_key(arg2, c     92                 return keyctl_read_key(arg2, compat_ptr(arg3), arg4);
 51                                                    93 
 52         case KEYCTL_CHOWN:                         94         case KEYCTL_CHOWN:
 53                 return keyctl_chown_key(arg2,      95                 return keyctl_chown_key(arg2, arg3, arg4);
 54                                                    96 
 55         case KEYCTL_SETPERM:                       97         case KEYCTL_SETPERM:
 56                 return keyctl_setperm_key(arg2     98                 return keyctl_setperm_key(arg2, arg3);
 57                                                    99 
 58         case KEYCTL_INSTANTIATE:                  100         case KEYCTL_INSTANTIATE:
 59                 return keyctl_instantiate_key(    101                 return keyctl_instantiate_key(arg2, compat_ptr(arg3), arg4,
 60                                                   102                                               arg5);
 61                                                   103 
 62         case KEYCTL_NEGATE:                       104         case KEYCTL_NEGATE:
 63                 return keyctl_negate_key(arg2,    105                 return keyctl_negate_key(arg2, arg3, arg4);
 64                                                   106 
 65         case KEYCTL_SET_REQKEY_KEYRING:           107         case KEYCTL_SET_REQKEY_KEYRING:
 66                 return keyctl_set_reqkey_keyri    108                 return keyctl_set_reqkey_keyring(arg2);
 67                                                   109 
 68         case KEYCTL_SET_TIMEOUT:                  110         case KEYCTL_SET_TIMEOUT:
 69                 return keyctl_set_timeout(arg2    111                 return keyctl_set_timeout(arg2, arg3);
 70                                                   112 
 71         case KEYCTL_ASSUME_AUTHORITY:             113         case KEYCTL_ASSUME_AUTHORITY:
 72                 return keyctl_assume_authority    114                 return keyctl_assume_authority(arg2);
 73                                                   115 
 74         case KEYCTL_GET_SECURITY:                 116         case KEYCTL_GET_SECURITY:
 75                 return keyctl_get_security(arg    117                 return keyctl_get_security(arg2, compat_ptr(arg3), arg4);
 76                                                   118 
 77         case KEYCTL_SESSION_TO_PARENT:            119         case KEYCTL_SESSION_TO_PARENT:
 78                 return keyctl_session_to_paren    120                 return keyctl_session_to_parent();
 79                                                   121 
 80         case KEYCTL_REJECT:                       122         case KEYCTL_REJECT:
 81                 return keyctl_reject_key(arg2,    123                 return keyctl_reject_key(arg2, arg3, arg4, arg5);
 82                                                   124 
 83         case KEYCTL_INSTANTIATE_IOV:              125         case KEYCTL_INSTANTIATE_IOV:
 84                 return keyctl_instantiate_key_ !! 126                 return compat_keyctl_instantiate_key_iov(
 85                                                !! 127                         arg2, compat_ptr(arg3), arg4, arg5);
 86                                                   128 
 87         case KEYCTL_INVALIDATE:                   129         case KEYCTL_INVALIDATE:
 88                 return keyctl_invalidate_key(a    130                 return keyctl_invalidate_key(arg2);
 89                                                   131 
 90         case KEYCTL_GET_PERSISTENT:               132         case KEYCTL_GET_PERSISTENT:
 91                 return keyctl_get_persistent(a    133                 return keyctl_get_persistent(arg2, arg3);
 92                                                   134 
 93         case KEYCTL_DH_COMPUTE:                   135         case KEYCTL_DH_COMPUTE:
 94                 return compat_keyctl_dh_comput !! 136                 return keyctl_dh_compute(compat_ptr(arg2), compat_ptr(arg3),
 95                                                !! 137                                          arg4, compat_ptr(arg5));
 96                                                << 
 97                                                << 
 98         case KEYCTL_RESTRICT_KEYRING:          << 
 99                 return keyctl_restrict_keyring << 
100                                                << 
101                                                << 
102         case KEYCTL_PKEY_QUERY:                << 
103                 if (arg3 != 0)                 << 
104                         return -EINVAL;        << 
105                 return keyctl_pkey_query(arg2, << 
106                                          compa << 
107                                          compa << 
108                                                << 
109         case KEYCTL_PKEY_ENCRYPT:              << 
110         case KEYCTL_PKEY_DECRYPT:              << 
111         case KEYCTL_PKEY_SIGN:                 << 
112                 return keyctl_pkey_e_d_s(optio << 
113                                          compa << 
114                                          compa << 
115                                                << 
116         case KEYCTL_PKEY_VERIFY:               << 
117                 return keyctl_pkey_verify(comp << 
118                                           comp << 
119                                                << 
120         case KEYCTL_MOVE:                      << 
121                 return keyctl_keyring_move(arg << 
122                                                << 
123         case KEYCTL_CAPABILITIES:              << 
124                 return keyctl_capabilities(com << 
125                                                << 
126         case KEYCTL_WATCH_KEY:                 << 
127                 return keyctl_watch_key(arg2,  << 
128                                                   138 
129         default:                                  139         default:
130                 return -EOPNOTSUPP;               140                 return -EOPNOTSUPP;
131         }                                         141         }
132 }                                                 142 }
133                                                   143 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php