From 8b63e5513b9dcb24df2056fb4d06272594bb5448 Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Tue, 9 Apr 2019 19:24:05 +0300 Subject: [PATCH] Fix invocations of access_ok() in fs-aufs4.patch It was needed to adapt to the changes made by mainline commit 96d4f267e40f "Remove 'type' argument from access_ok() function". --- fs-aufs4.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs-aufs4.patch b/fs-aufs4.patch index a0293fc..6ba9df6 100644 --- a/fs-aufs4.patch +++ b/fs-aufs4.patch @@ -3458,7 +3458,7 @@ index 000000000000..598cf370a1dc + + err = copy_from_user(&ibusy, arg, sizeof(ibusy)); + if (!err) -+ err = !access_ok(VERIFY_WRITE, &arg->h_ino, sizeof(arg->h_ino)); ++ err = !access_ok(&arg->h_ino, sizeof(arg->h_ino)); + if (unlikely(err)) { + err = -EFAULT; + AuTraceErr(err); @@ -24783,7 +24783,7 @@ index 000000000000..59ce2d700ec9 + + err = copy_from_user(&args->mvdown, uarg, sizeof(args->mvdown)); + if (!err) -+ err = !access_ok(VERIFY_WRITE, uarg, sizeof(*uarg)); ++ err = !access_ok(uarg, sizeof(*uarg)); + if (unlikely(err)) { + err = -EFAULT; + AuTraceErr(err); @@ -27964,7 +27964,7 @@ index 000000000000..bf0233a2887d + struct file *h_file; + struct au_rdu_cookie *cookie = &rdu->cookie; + -+ err = !access_ok(VERIFY_WRITE, rdu->ent.e, rdu->sz); ++ err = !access_ok(rdu->ent.e, rdu->sz); + if (unlikely(err)) { + err = -EFAULT; + AuTraceErr(err); @@ -28070,7 +28070,7 @@ index 000000000000..bf0233a2887d + /* unnecessary to support mmap_sem since this is a dir */ + err = copy_from_user(&ent, u->e, sizeof(ent)); + if (!err) -+ err = !access_ok(VERIFY_WRITE, &u->e->ino, sizeof(ino)); ++ err = !access_ok(&u->e->ino, sizeof(ino)); + if (unlikely(err)) { + err = -EFAULT; + AuTraceErr(err); @@ -30721,7 +30721,7 @@ index 000000000000..927f6b252c75 + + sz = sizeof(*arg) - offsetof(union aufs_brinfo, path); + for (bindex = 0; bindex <= bbot; bindex++, arg++) { -+ err = !access_ok(VERIFY_WRITE, arg, sizeof(*arg)); ++ err = !access_ok(arg, sizeof(*arg)); + if (unlikely(err)) + break; +