lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 12 Apr 2012 18:01:20 +0800 From: handai.szj@...il.com To: linux-kernel@...r.kernel.org Cc: davidel@...ilserver.org, akpm@...ux-foundation.org, Sha Zhengju <handai.szj@...bao.com> Subject: [PATCH] eventfd: change int to __u64 in eventfd_signal() From: Sha Zhengju <handai.szj@...bao.com> From: Sha Zhengju <handai.szj@...bao.com> eventfd_ctx->count is an __u64 counter which is allowed to reach ULLONG_MAX. Now eventfd_write() add an __u64 value to "count", but kernel side eventfd_signal() only add an int value to it. So make them consistent here. Signed-off-by: Sha Zhengju <handai.szj@...bao.com> --- fs/eventfd.c | 4 ++-- include/linux/eventfd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/eventfd.c b/fs/eventfd.c index dba15fe..9e63e42 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -51,7 +51,7 @@ struct eventfd_ctx { * * -EINVAL : The value of @n is negative. */ -int eventfd_signal(struct eventfd_ctx *ctx, int n) +__u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n) { unsigned long flags; @@ -59,7 +59,7 @@ int eventfd_signal(struct eventfd_ctx *ctx, int n) return -EINVAL; spin_lock_irqsave(&ctx->wqh.lock, flags); if (ULLONG_MAX - ctx->count < n) - n = (int) (ULLONG_MAX - ctx->count); + n = ULLONG_MAX - ctx->count; ctx->count += n; if (waitqueue_active(&ctx->wqh)) wake_up_locked_poll(&ctx->wqh, POLLIN); diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index 91bb4f2..3c3ef19 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h @@ -34,7 +34,7 @@ void eventfd_ctx_put(struct eventfd_ctx *ctx); struct file *eventfd_fget(int fd); struct eventfd_ctx *eventfd_ctx_fdget(int fd); struct eventfd_ctx *eventfd_ctx_fileget(struct file *file); -int eventfd_signal(struct eventfd_ctx *ctx, int n); +__u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n); ssize_t eventfd_ctx_read(struct eventfd_ctx *ctx, int no_wait, __u64 *cnt); int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_t *wait, __u64 *cnt); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists