mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: jmorris@namei.org
Cc: keyrings@linux-nfs.org, linux-kernel@vger.kernel.org,
	dhowells@redhat.com, linux-security-module@vger.kernel.org,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	Vivek Goyal <vgoyal@redhat.com>
Subject: [PATCH 2/6] KEYS: Reinstate EPERM for a key type name beginning with a '.'
Date: Wed, 10 Sep 2014 22:22:06 +0100	[thread overview]
Message-ID: <20140910212206.10752.21818.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20140910212154.10752.23343.stgit@warthog.procyon.org.uk>

Reinstate the generation of EPERM for a key type name beginning with a '.' in
a userspace call.  Types whose name begins with a '.' are internal only.

The test was removed by:

	commit a4e3b8d79a5c6d40f4a9703abf7fe3abcc6c3b8d
	Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
	Date:   Thu May 22 14:02:23 2014 -0400
	Subject: KEYS: special dot prefixed keyring name bug fix

I think we want to keep the restriction on type name so that userspace can't
add keys of a special internal type.

Note that removal of the test causes several of the tests in the keyutils
testsuite to fail.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
---

 security/keys/keyctl.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index e26f860e5f2e..eff88a5f5d40 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -37,6 +37,8 @@ static int key_get_type_from_user(char *type,
 		return ret;
 	if (ret == 0 || ret >= len)
 		return -EINVAL;
+	if (type[0] == '.')
+		return -EPERM;
 	type[len - 1] = '\0';
 	return 0;
 }


  parent reply	other threads:[~2014-09-10 21:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-10 21:21 [PATCH 0/6] KEYS: Miscellaneous fixes David Howells
2014-09-10 21:22 ` [PATCH 1/6] KEYS: Fix termination condition in assoc array garbage collection David Howells
2014-09-10 21:22 ` David Howells [this message]
2014-09-10 23:36   ` [PATCH 2/6] KEYS: Reinstate EPERM for a key type name beginning with a '.' Mimi Zohar
2014-09-11 11:43     ` Mimi Zohar
2014-09-11 12:09     ` David Howells
2014-09-11 12:27       ` Dmitry Kasatkin
2014-09-11 12:28         ` Dmitry Kasatkin
2014-09-11 13:46         ` Mimi Zohar
2014-09-11 21:26         ` David Howells
2014-09-10 21:22 ` [PATCH 3/6] KEYS: Fix missing statics David Howells
2014-09-10 21:22 ` [PATCH 4/6] PKCS#7: Add a missing static David Howells
2014-09-10 21:22 ` [PATCH 5/6] PKCS#7: Provide a single place to do signed info block freeing David Howells
2014-09-10 21:22 ` [PATCH 6/6] PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs David Howells
2014-09-15 13:04 ` [PATCH 0/6] KEYS: Miscellaneous fixes David Howells
2014-09-16  2:15   ` James Morris
2014-09-16  9:07   ` David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140910212206.10752.21818.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=jmorris@namei.org \
    --cc=keyrings@linux-nfs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=vgoyal@redhat.com \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®