Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6d6f972f
Commit
6d6f972f
authored
Apr 01, 2003
by
Stephen Rothwell
Committed by
Linus Torvalds
Apr 01, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] stop even more macros for comverting compat pointers
Just want to nip this in the bud :-)
parent
b3506a09
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
arch/x86_64/ia32/sys_ia32.c
arch/x86_64/ia32/sys_ia32.c
+4
-5
No files found.
arch/x86_64/ia32/sys_ia32.c
View file @
6d6f972f
...
@@ -75,7 +75,6 @@
...
@@ -75,7 +75,6 @@
#define A(__x) ((unsigned long)(__x))
#define A(__x) ((unsigned long)(__x))
#define AA(__x) ((unsigned long)(__x))
#define AA(__x) ((unsigned long)(__x))
#define u32_to_ptr(x) ((void *)(u64)(x))
#define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
#define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
...
@@ -2091,7 +2090,7 @@ long sys32_io_setup(unsigned nr_reqs, u32 *ctx32p)
...
@@ -2091,7 +2090,7 @@ long sys32_io_setup(unsigned nr_reqs, u32 *ctx32p)
}
}
asmlinkage
long
sys32_io_submit
(
aio_context_t
ctx_id
,
int
nr
,
asmlinkage
long
sys32_io_submit
(
aio_context_t
ctx_id
,
int
nr
,
u32
*
iocbpp
)
compat_uptr_t
*
iocbpp
)
{
{
struct
kioctx
*
ctx
;
struct
kioctx
*
ctx
;
long
ret
=
0
;
long
ret
=
0
;
...
@@ -2110,14 +2109,14 @@ asmlinkage long sys32_io_submit(aio_context_t ctx_id, int nr,
...
@@ -2110,14 +2109,14 @@ asmlinkage long sys32_io_submit(aio_context_t ctx_id, int nr,
}
}
for
(
i
=
0
;
i
<
nr
;
i
++
)
{
for
(
i
=
0
;
i
<
nr
;
i
++
)
{
u32
p32
;
compat_uptr_t
p32
;
struct
iocb
*
user_iocb
,
tmp
;
struct
iocb
*
user_iocb
,
tmp
;
if
(
unlikely
(
__get_user
(
p32
,
iocbpp
+
i
)))
{
if
(
unlikely
(
__get_user
(
p32
,
iocbpp
+
i
)))
{
ret
=
-
EFAULT
;
ret
=
-
EFAULT
;
break
;
break
;
}
}
user_iocb
=
u32_to
_ptr
(
p32
);
user_iocb
=
compat
_ptr
(
p32
);
if
(
unlikely
(
copy_from_user
(
&
tmp
,
user_iocb
,
sizeof
(
tmp
))))
{
if
(
unlikely
(
copy_from_user
(
&
tmp
,
user_iocb
,
sizeof
(
tmp
))))
{
ret
=
-
EFAULT
;
ret
=
-
EFAULT
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment