Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
5ef50d01
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 4 年多
通知
15
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
5ef50d01
编写于
1月 16, 2017
作者:
J
John Johansen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
apparmor: remove unused op parameter from simple_write_to_buffer()
Signed-off-by:
N
John Johansen
<
john.johansen@canonical.com
>
上级
ef88a7ac
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
6 deletion
+3
-6
security/apparmor/apparmorfs.c
security/apparmor/apparmorfs.c
+3
-6
未找到文件。
security/apparmor/apparmorfs.c
浏览文件 @
5ef50d01
...
@@ -76,7 +76,6 @@ static int mangle_name(const char *name, char *target)
...
@@ -76,7 +76,6 @@ static int mangle_name(const char *name, char *target)
/**
/**
* aa_simple_write_to_buffer - common routine for getting policy from user
* aa_simple_write_to_buffer - common routine for getting policy from user
* @op: operation doing the user buffer copy
* @userbuf: user buffer to copy data from (NOT NULL)
* @userbuf: user buffer to copy data from (NOT NULL)
* @alloc_size: size of user buffer (REQUIRES: @alloc_size >= @copy_size)
* @alloc_size: size of user buffer (REQUIRES: @alloc_size >= @copy_size)
* @copy_size: size of data to copy from user buffer
* @copy_size: size of data to copy from user buffer
...
@@ -85,8 +84,7 @@ static int mangle_name(const char *name, char *target)
...
@@ -85,8 +84,7 @@ static int mangle_name(const char *name, char *target)
* Returns: kernel buffer containing copy of user buffer data or an
* Returns: kernel buffer containing copy of user buffer data or an
* ERR_PTR on failure.
* ERR_PTR on failure.
*/
*/
static
struct
aa_loaddata
*
aa_simple_write_to_buffer
(
const
char
*
op
,
static
struct
aa_loaddata
*
aa_simple_write_to_buffer
(
const
char
__user
*
userbuf
,
const
char
__user
*
userbuf
,
size_t
alloc_size
,
size_t
alloc_size
,
size_t
copy_size
,
size_t
copy_size
,
loff_t
*
pos
)
loff_t
*
pos
)
...
@@ -130,7 +128,7 @@ static ssize_t policy_update(int binop, const char __user *buf, size_t size,
...
@@ -130,7 +128,7 @@ static ssize_t policy_update(int binop, const char __user *buf, size_t size,
if
(
error
)
if
(
error
)
return
error
;
return
error
;
data
=
aa_simple_write_to_buffer
(
op
,
buf
,
size
,
size
,
pos
);
data
=
aa_simple_write_to_buffer
(
buf
,
size
,
size
,
pos
);
error
=
PTR_ERR
(
data
);
error
=
PTR_ERR
(
data
);
if
(
!
IS_ERR
(
data
))
{
if
(
!
IS_ERR
(
data
))
{
error
=
aa_replace_profiles
(
ns
?
ns
:
profile
->
ns
,
profile
,
error
=
aa_replace_profiles
(
ns
?
ns
:
profile
->
ns
,
profile
,
...
@@ -196,8 +194,7 @@ static ssize_t profile_remove(struct file *f, const char __user *buf,
...
@@ -196,8 +194,7 @@ static ssize_t profile_remove(struct file *f, const char __user *buf,
* aa_remove_profile needs a null terminated string so 1 extra
* aa_remove_profile needs a null terminated string so 1 extra
* byte is allocated and the copied data is null terminated.
* byte is allocated and the copied data is null terminated.
*/
*/
data
=
aa_simple_write_to_buffer
(
OP_PROF_RM
,
buf
,
size
+
1
,
size
,
data
=
aa_simple_write_to_buffer
(
buf
,
size
+
1
,
size
,
pos
);
pos
);
error
=
PTR_ERR
(
data
);
error
=
PTR_ERR
(
data
);
if
(
!
IS_ERR
(
data
))
{
if
(
!
IS_ERR
(
data
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录