From: Waiman Long <longman@redhat.com>
To: David Howells <dhowells@redhat.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Mimi Zohar <zohar@linux.ibm.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: keyrings@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-integrity@vger.kernel.org, netdev@vger.kernel.org,
linux-afs@lists.infradead.org, Sumit Garg <sumit.garg@linaro.org>,
Jerry Snitselaar <jsnitsel@redhat.com>,
Roberto Sassu <roberto.sassu@huawei.com>,
Eric Biggers <ebiggers@google.com>,
Chris von Recklinghausen <crecklin@redhat.com>,
Waiman Long <longman@redhat.com>
Subject: [PATCH v4 3/4] KEYS: Remove __user annotation from dns_resolver_read()
Date: Tue, 17 Mar 2020 15:41:39 -0400 [thread overview]
Message-ID: <20200317194140.6031-4-longman@redhat.com> (raw)
In-Reply-To: <20200317194140.6031-1-longman@redhat.com>
As the keyctl_read_key() has been modified to use a temporary kernel
buffer to read out the key data instead of passing in the user-supplied
buffer directly, there is no need to use the __user annotation for
dns_resolver_read().
Signed-off-by: Waiman Long <longman@redhat.com>
---
net/dns_resolver/dns_key.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 3e1a90669006..ad53eb31d40f 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -302,7 +302,7 @@ static void dns_resolver_describe(const struct key *key, struct seq_file *m)
* - the key's semaphore is read-locked
*/
static long dns_resolver_read(const struct key *key,
- char __user *buffer, size_t buflen)
+ char *buffer, size_t buflen)
{
int err = PTR_ERR(key->payload.data[dns_key_error]);
--
2.18.1
next prev parent reply other threads:[~2020-03-17 19:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 19:41 [PATCH v4 0/4] KEYS: Read keys to internal buffer & then copy to userspace Waiman Long
2020-03-17 19:41 ` [PATCH v4 1/4] KEYS: Don't write out to userspace while holding key semaphore Waiman Long
2020-03-17 19:41 ` [PATCH v4 2/4] KEYS: Remove __user annotation from rxrpc_read() Waiman Long
2020-03-17 19:41 ` Waiman Long [this message]
2020-03-17 19:41 ` [PATCH v4 4/4] KEYS: Avoid false positive ENOMEM error on key read Waiman Long
2020-03-18 8:23 ` [PATCH v4 2/4] KEYS: Remove __user annotation from rxrpc_read() David Howells
2020-03-18 14:32 ` Waiman Long
2020-03-18 8:27 ` [PATCH v4 4/4] KEYS: Avoid false positive ENOMEM error on key read David Howells
2020-03-18 14:34 ` Waiman Long
2020-03-18 15:14 ` 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=20200317194140.6031-4-longman@redhat.com \
--to=longman@redhat.com \
--cc=crecklin@redhat.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=ebiggers@google.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jmorris@namei.org \
--cc=jsnitsel@redhat.com \
--cc=keyrings@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roberto.sassu@huawei.com \
--cc=serge@hallyn.com \
--cc=sumit.garg@linaro.org \
--cc=zohar@linux.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;
as well as URLs for NNTP newsgroup(s).