Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
da184284
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
163
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
da184284
编写于
9年前
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
net: switch importing msghdr from userland to {compat_,}import_iovec()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
602bd0e9
无相关合并请求
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
31 deletion
+20
-31
include/net/compat.h
include/net/compat.h
+1
-1
net/compat.c
net/compat.c
+7
-11
net/socket.c
net/socket.c
+12
-19
未找到文件。
include/net/compat.h
浏览文件 @
da184284
...
...
@@ -40,7 +40,7 @@ int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
#define compat_mmsghdr mmsghdr
#endif
/* defined(CONFIG_COMPAT) */
ssize_
t
get_compat_msghdr
(
struct
msghdr
*
,
struct
compat_msghdr
__user
*
,
in
t
get_compat_msghdr
(
struct
msghdr
*
,
struct
compat_msghdr
__user
*
,
struct
sockaddr
__user
**
,
struct
iovec
**
);
asmlinkage
long
compat_sys_sendmsg
(
int
,
struct
compat_msghdr
__user
*
,
unsigned
int
);
...
...
This diff is collapsed.
Click to expand it.
net/compat.c
浏览文件 @
da184284
...
...
@@ -31,10 +31,10 @@
#include <asm/uaccess.h>
#include <net/compat.h>
ssize_
t
get_compat_msghdr
(
struct
msghdr
*
kmsg
,
struct
compat_msghdr
__user
*
umsg
,
struct
sockaddr
__user
**
save_addr
,
struct
iovec
**
iov
)
in
t
get_compat_msghdr
(
struct
msghdr
*
kmsg
,
struct
compat_msghdr
__user
*
umsg
,
struct
sockaddr
__user
**
save_addr
,
struct
iovec
**
iov
)
{
compat_uptr_t
uaddr
,
uiov
,
tmp3
;
compat_size_t
nr_segs
;
...
...
@@ -81,13 +81,9 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
kmsg
->
msg_iocb
=
NULL
;
err
=
compat_rw_copy_check_uvector
(
save_addr
?
READ
:
WRITE
,
compat_ptr
(
uiov
),
nr_segs
,
UIO_FASTIOV
,
*
iov
,
iov
);
if
(
err
>=
0
)
iov_iter_init
(
&
kmsg
->
msg_iter
,
save_addr
?
READ
:
WRITE
,
*
iov
,
nr_segs
,
err
);
return
err
;
return
compat_import_iovec
(
save_addr
?
READ
:
WRITE
,
compat_ptr
(
uiov
),
nr_segs
,
UIO_FASTIOV
,
iov
,
&
kmsg
->
msg_iter
);
}
/* Bleech... */
...
...
This diff is collapsed.
Click to expand it.
net/socket.c
浏览文件 @
da184284
...
...
@@ -1841,10 +1841,10 @@ struct used_address {
unsigned
int
name_len
;
};
static
ssize_
t
copy_msghdr_from_user
(
struct
msghdr
*
kmsg
,
struct
user_msghdr
__user
*
umsg
,
struct
sockaddr
__user
**
save_addr
,
struct
iovec
**
iov
)
static
in
t
copy_msghdr_from_user
(
struct
msghdr
*
kmsg
,
struct
user_msghdr
__user
*
umsg
,
struct
sockaddr
__user
**
save_addr
,
struct
iovec
**
iov
)
{
struct
sockaddr
__user
*
uaddr
;
struct
iovec
__user
*
uiov
;
...
...
@@ -1890,13 +1890,8 @@ static ssize_t copy_msghdr_from_user(struct msghdr *kmsg,
kmsg
->
msg_iocb
=
NULL
;
err
=
rw_copy_check_uvector
(
save_addr
?
READ
:
WRITE
,
uiov
,
nr_segs
,
UIO_FASTIOV
,
*
iov
,
iov
);
if
(
err
>=
0
)
iov_iter_init
(
&
kmsg
->
msg_iter
,
save_addr
?
READ
:
WRITE
,
*
iov
,
nr_segs
,
err
);
return
err
;
return
import_iovec
(
save_addr
?
READ
:
WRITE
,
uiov
,
nr_segs
,
UIO_FASTIOV
,
iov
,
&
kmsg
->
msg_iter
);
}
static
int
___sys_sendmsg
(
struct
socket
*
sock
,
struct
user_msghdr
__user
*
msg
,
...
...
@@ -1921,8 +1916,8 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
else
err
=
copy_msghdr_from_user
(
msg_sys
,
msg
,
NULL
,
&
iov
);
if
(
err
<
0
)
goto
out_freeiov
;
total_len
=
err
;
return
err
;
total_len
=
iov_iter_count
(
&
msg_sys
->
msg_iter
)
;
err
=
-
ENOBUFS
;
...
...
@@ -1988,8 +1983,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
if
(
ctl_buf
!=
ctl
)
sock_kfree_s
(
sock
->
sk
,
ctl_buf
,
ctl_len
);
out_freeiov:
if
(
iov
!=
iovstack
)
kfree
(
iov
);
kfree
(
iov
);
return
err
;
}
...
...
@@ -2114,8 +2108,8 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
else
err
=
copy_msghdr_from_user
(
msg_sys
,
msg
,
&
uaddr
,
&
iov
);
if
(
err
<
0
)
goto
out_freeiov
;
total_len
=
err
;
return
err
;
total_len
=
iov_iter_count
(
&
msg_sys
->
msg_iter
)
;
cmsg_ptr
=
(
unsigned
long
)
msg_sys
->
msg_control
;
msg_sys
->
msg_flags
=
flags
&
(
MSG_CMSG_CLOEXEC
|
MSG_CMSG_COMPAT
);
...
...
@@ -2153,8 +2147,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
err
=
len
;
out_freeiov:
if
(
iov
!=
iovstack
)
kfree
(
iov
);
kfree
(
iov
);
return
err
;
}
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部