Djam/kernel-6.1
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-6.1.git synced 2025-02-25 08:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix invocations of access_ok() in fs-aufs4.patch

Browse source 
It was needed to adapt to the changes made by mainline commit
96d4f267e40f "Remove 'type' argument from access_ok() function".
This commit is contained in:
Evgenii Shatokhin 2019-04-09 19:24:05 +03:00
parent 27010ed411
commit 8b63e5513b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs-aufs4.patch
View file

@ -3458,7 +3458,7 @@ index 000000000000..598cf370a1dc
+ +
+ err = copy_from_user(&ibusy, arg, sizeof(ibusy)); + err = copy_from_user(&ibusy, arg, sizeof(ibusy));
+ if (!err) + 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)) { + if (unlikely(err)) {
+ err = -EFAULT; + err = -EFAULT;
+ AuTraceErr(err); + AuTraceErr(err);
@ -24783,7 +24783,7 @@ index 000000000000..59ce2d700ec9
+ +
+ err = copy_from_user(&args->mvdown, uarg, sizeof(args->mvdown)); + err = copy_from_user(&args->mvdown, uarg, sizeof(args->mvdown));
+ if (!err) + if (!err)
+ err = !access_ok(VERIFY_WRITE, uarg, sizeof(*uarg)); + err = !access_ok(uarg, sizeof(*uarg));
+ if (unlikely(err)) { + if (unlikely(err)) {
+ err = -EFAULT; + err = -EFAULT;
+ AuTraceErr(err); + AuTraceErr(err);
@ -27964,7 +27964,7 @@ index 000000000000..bf0233a2887d
+ struct file *h_file; + struct file *h_file;
+ struct au_rdu_cookie *cookie = &rdu->cookie; + 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)) { + if (unlikely(err)) {
+ err = -EFAULT; + err = -EFAULT;
+ AuTraceErr(err); + AuTraceErr(err);
@ -28070,7 +28070,7 @@ index 000000000000..bf0233a2887d
+ /* unnecessary to support mmap_sem since this is a dir */ + /* unnecessary to support mmap_sem since this is a dir */
+ err = copy_from_user(&ent, u->e, sizeof(ent)); + err = copy_from_user(&ent, u->e, sizeof(ent));
+ if (!err) + if (!err)
+ err = !access_ok(VERIFY_WRITE, &u->e->ino, sizeof(ino)); + err = !access_ok(&u->e->ino, sizeof(ino));
+ if (unlikely(err)) { + if (unlikely(err)) {
+ err = -EFAULT; + err = -EFAULT;
+ AuTraceErr(err); + AuTraceErr(err);
@ -30721,7 +30721,7 @@ index 000000000000..927f6b252c75
+ +
+ sz = sizeof(*arg) - offsetof(union aufs_brinfo, path); + sz = sizeof(*arg) - offsetof(union aufs_brinfo, path);
+ for (bindex = 0; bindex <= bbot; bindex++, arg++) { + for (bindex = 0; bindex <= bbot; bindex++, arg++) {
+ err = !access_ok(VERIFY_WRITE, arg, sizeof(*arg)); + err = !access_ok(arg, sizeof(*arg));
+ if (unlikely(err)) + if (unlikely(err))
+ break; + break;
+ +