The patch titled
add-listio-syscall-support fix 2
has been removed from the -mm tree. Its filename was
add-listio-syscall-support-fix-2.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: add-listio-syscall-support fix 2
From: Bharata B Rao <bharata@xxxxxxxxxx>
Removes mid-function returns by always returning from a common point(end) in
compat_sys_lio_submit().
Signed-off-by: Bharata B Rao <bharata@xxxxxxxxxx>
Cc: Sébastien Dugué <sebastien.dugue@xxxxxxxx>
Cc: Laurent Vivier <laurent.vivier@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/compat.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff -puN fs/compat.c~add-listio-syscall-support-fix-2 fs/compat.c
--- a/fs/compat.c~add-listio-syscall-support-fix-2
+++ a/fs/compat.c
@@ -735,18 +735,25 @@ compat_sys_lio_submit(aio_context_t ctx_
struct sigevent __user *event = NULL;
long ret = 0;
- if (unlikely(nr < 0))
- return -EINVAL;
+ if (unlikely(nr < 0)) {
+ ret = -EINVAL;
+ goto out;
+ }
- if (unlikely(!access_ok(VERIFY_READ, iocb, (nr * sizeof(u32)))))
- return -EFAULT;
+ if (unlikely(!access_ok(VERIFY_READ, iocb, (nr * sizeof(u32))))) {
+ ret = -EFAULT;
+ goto out;
+ }
ctx = lookup_ioctx(ctx_id);
- if (unlikely(!ctx))
- return -EINVAL;
+ if (unlikely(!ctx)) {
+ ret = -EINVAL;
+ goto out;
+ }
if (sig_user) {
struct sigevent kevent;
+
event = compat_alloc_user_space(sizeof(struct sigevent));
if (get_compat_sigevent(&kevent, sig_user) ||
copy_to_user(event, &kevent, sizeof(struct sigevent))) {
@@ -783,6 +790,7 @@ compat_sys_lio_submit(aio_context_t ctx_
}
out_put_ctx:
put_ioctx(ctx);
+out:
return ret;
}
_
Patches currently in -mm which might be from bharata@xxxxxxxxxx are
add-listio-syscall-support-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
