From: Matt Mackall <mpm@selenic.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 03 of 12] random: use unlocked_ioctl
Date: Thu, 17 Jan 2008 20:33:45 -0600 [thread overview]
Message-ID: <6f8bed9c59f7d2e5aab7.1200623625@cinder.waste.org> (raw)
In-Reply-To: <patchbomb.1200623622@cinder.waste.org>
No locking actually needed.
Signed-off-by: Matt Mackall <mpm@selenic.com>
diff -r f814137b0bfc -r 6f8bed9c59f7 drivers/char/random.c
--- a/drivers/char/random.c Thu Jan 17 20:25:23 2008 -0600
+++ b/drivers/char/random.c Thu Jan 17 20:25:23 2008 -0600
@@ -1063,8 +1063,7 @@
return (ssize_t)count;
}
-static int random_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
{
int size, ent_count;
int __user *p = (int __user *)arg;
@@ -1072,8 +1071,8 @@
switch (cmd) {
case RNDGETENTCNT:
- ent_count = input_pool.entropy_count;
- if (put_user(ent_count, p))
+ /* inherently racy, no point locking */
+ if (put_user(input_pool.entropy_count, p))
return -EFAULT;
return 0;
case RNDADDTOENTCNT:
@@ -1116,13 +1115,13 @@
.read = random_read,
.write = random_write,
.poll = random_poll,
- .ioctl = random_ioctl,
+ .unlocked_ioctl = random_ioctl,
};
const struct file_operations urandom_fops = {
.read = urandom_read,
.write = random_write,
- .ioctl = random_ioctl,
+ .unlocked_ioctl = random_ioctl,
};
/***************************************************************
next prev parent reply other threads:[~2008-01-18 2:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-18 2:33 [PATCH 00 of 12] random cleanups for 2.6.25 Matt Mackall
2008-01-18 2:33 ` [PATCH 01 of 12] random: clean up checkpatch complaints Matt Mackall
2008-01-18 2:33 ` [PATCH 02 of 12] random: consolidate wakeup logic Matt Mackall
2008-01-18 2:33 ` Matt Mackall [this message]
2008-01-18 2:33 ` [PATCH 04 of 12] random: reuse rand_initialize Matt Mackall
2008-01-18 2:33 ` [PATCH 05 of 12] random: improve variable naming, clear extract buffer Matt Mackall
2008-01-18 2:33 ` [PATCH 06 of 12] random: make backtracking attacks harder Matt Mackall
2008-01-18 2:33 ` [PATCH 07 of 12] random: remove cacheline alignment for locks Matt Mackall
2008-01-18 2:33 ` [PATCH 08 of 12] random: eliminate redundant new_rotate variable Matt Mackall
2008-01-18 2:33 ` [PATCH 09 of 12] random: remove some prefetch logic Matt Mackall
2008-01-18 2:33 ` [PATCH 10 of 12] random: simplify add_ptr logic Matt Mackall
2008-01-18 2:33 ` [PATCH 11 of 12] random: make mixing interface byte-oriented Matt Mackall
2008-01-18 2:33 ` [PATCH 12 of 12] random: simplify and rename credit_entropy_store Matt Mackall
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=6f8bed9c59f7d2e5aab7.1200623625@cinder.waste.org \
--to=mpm@selenic.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/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®