* [GIT PULL] KEYS: Make perm request flags available to security modules
@ 2014-03-31 13:28 David Howells
2014-03-31 15:32 ` James Morris
2014-03-31 15:54 ` David Howells
0 siblings, 2 replies; 5+ messages in thread
From: David Howells @ 2014-03-31 13:28 UTC (permalink / raw)
To: torvalds
Cc: dhowells, d.kasatkin, casey, keyrings, linux-security-module,
linux-kernel
Hi Linus,
Can you pull this pair of patches please? They move the flags that are used
to request specific permissions to a more public header file so that they can
then be used by Smack (and other security modules).
The flags for requesting permissions on keys are not the same as the flags in
the permissions mask on a key (the latter has four sets that interact).
Note that the flags have to be renamed so that they don't conflict with
input symbols (eg. keyboard key names).
David
---
The following changes since commit c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4:
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2014-03-13 21:32:16 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/keys-20140314
for you to fetch changes up to fffea214abf66a8672cfd6697fae65e743e22f11:
smack: fix key permission verification (2014-03-14 17:44:49 +0000)
----------------------------------------------------------------
(from the branch description for keys-dmitry local branch)
Keyrings stuff for/from Dmitry Kasatkin
Keyrings changes
----------------------------------------------------------------
David Howells (1):
KEYS: Move the flags representing required permission to linux/key.h
Dmitry Kasatkin (1):
smack: fix key permission verification
include/linux/key.h | 11 +++++++++++
include/linux/security.h | 6 +++---
security/capability.c | 2 +-
security/keys/internal.h | 11 +----------
security/keys/key.c | 6 +++---
security/keys/keyctl.c | 44 ++++++++++++++++++++++----------------------
security/keys/keyring.c | 8 ++++----
security/keys/permission.c | 4 ++--
security/keys/persistent.c | 4 ++--
security/keys/proc.c | 2 +-
security/security.c | 2 +-
security/selinux/hooks.c | 2 +-
security/smack/smack_lsm.c | 9 +++++++--
13 files changed, 59 insertions(+), 52 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] KEYS: Make perm request flags available to security modules
2014-03-31 13:28 [GIT PULL] KEYS: Make perm request flags available to security modules David Howells
@ 2014-03-31 15:32 ` James Morris
2014-03-31 15:54 ` David Howells
1 sibling, 0 replies; 5+ messages in thread
From: James Morris @ 2014-03-31 15:32 UTC (permalink / raw)
To: David Howells
Cc: torvalds, d.kasatkin, casey, keyrings, linux-security-module,
linux-kernel
On Mon, 31 Mar 2014, David Howells wrote:
>
> Hi Linus,
>
> Can you pull this pair of patches please? They move the flags that are used
> to request specific permissions to a more public header file so that they can
> then be used by Smack (and other security modules).
These should be going via my tree.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KEYS: Make perm request flags available to security modules
2014-03-31 13:28 [GIT PULL] KEYS: Make perm request flags available to security modules David Howells
2014-03-31 15:32 ` James Morris
@ 2014-03-31 15:54 ` David Howells
2014-03-31 23:30 ` James Morris
1 sibling, 1 reply; 5+ messages in thread
From: David Howells @ 2014-03-31 15:54 UTC (permalink / raw)
To: James Morris
Cc: dhowells, torvalds, d.kasatkin, casey, keyrings,
linux-security-module, linux-kernel
James Morris <jmorris@namei.org> wrote:
> > Can you pull this pair of patches please? They move the flags that are
> > used to request specific permissions to a more public header file so that
> > they can then be used by Smack (and other security modules).
>
> These should be going via my tree.
Okay, if you could pull them then. I thought Linus wanted keyrings stuff to
go separately.
David
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KEYS: Make perm request flags available to security modules
2014-03-31 15:54 ` David Howells
@ 2014-03-31 23:30 ` James Morris
2014-04-14 1:39 ` James Morris
0 siblings, 1 reply; 5+ messages in thread
From: James Morris @ 2014-03-31 23:30 UTC (permalink / raw)
To: David Howells
Cc: torvalds, d.kasatkin, casey, keyrings, linux-security-module,
linux-kernel
On Mon, 31 Mar 2014, David Howells wrote:
> James Morris <jmorris@namei.org> wrote:
>
> > > Can you pull this pair of patches please? They move the flags that are
> > > used to request specific permissions to a more public header file so that
> > > they can then be used by Smack (and other security modules).
> >
> > These should be going via my tree.
>
> Okay, if you could pull them then. I thought Linus wanted keyrings stuff to
> go separately.
I don't recall that.
I'll pull them after the merge window.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KEYS: Make perm request flags available to security modules
2014-03-31 23:30 ` James Morris
@ 2014-04-14 1:39 ` James Morris
0 siblings, 0 replies; 5+ messages in thread
From: James Morris @ 2014-04-14 1:39 UTC (permalink / raw)
To: David Howells
Cc: torvalds, d.kasatkin, casey, keyrings, linux-security-module,
linux-kernel
On Tue, 1 Apr 2014, James Morris wrote:
> On Mon, 31 Mar 2014, David Howells wrote:
>
> > James Morris <jmorris@namei.org> wrote:
> >
> > > > Can you pull this pair of patches please? They move the flags that are
> > > > used to request specific permissions to a more public header file so that
> > > > they can then be used by Smack (and other security modules).
> > >
> > > These should be going via my tree.
> >
> > Okay, if you could pull them then. I thought Linus wanted keyrings stuff to
> > go separately.
>
> I don't recall that.
>
> I'll pull them after the merge window.
>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-04-14 1:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-31 13:28 [GIT PULL] KEYS: Make perm request flags available to security modules David Howells
2014-03-31 15:32 ` James Morris
2014-03-31 15:54 ` David Howells
2014-03-31 23:30 ` James Morris
2014-04-14 1:39 ` James Morris
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.