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
Kirill Smelkov
linux
Commits
74f0414b
Commit
74f0414b
authored
Mar 03, 2015
by
James Morris
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'yama-4.0' of
git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
into next
parents
c517d838
44aa1d44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
security/yama/Kconfig
security/yama/Kconfig
+0
-2
security/yama/yama_lsm.c
security/yama/yama_lsm.c
+5
-8
No files found.
security/yama/Kconfig
View file @
74f0414b
config SECURITY_YAMA
config SECURITY_YAMA
bool "Yama support"
bool "Yama support"
depends on SECURITY
depends on SECURITY
select SECURITYFS
select SECURITY_PATH
default n
default n
help
help
This selects Yama, which extends DAC support with additional
This selects Yama, which extends DAC support with additional
...
...
security/yama/yama_lsm.c
View file @
74f0414b
...
@@ -379,20 +379,17 @@ static struct security_operations yama_ops = {
...
@@ -379,20 +379,17 @@ static struct security_operations yama_ops = {
static
int
yama_dointvec_minmax
(
struct
ctl_table
*
table
,
int
write
,
static
int
yama_dointvec_minmax
(
struct
ctl_table
*
table
,
int
write
,
void
__user
*
buffer
,
size_t
*
lenp
,
loff_t
*
ppos
)
void
__user
*
buffer
,
size_t
*
lenp
,
loff_t
*
ppos
)
{
{
int
rc
;
struct
ctl_table
table_copy
;
if
(
write
&&
!
capable
(
CAP_SYS_PTRACE
))
if
(
write
&&
!
capable
(
CAP_SYS_PTRACE
))
return
-
EPERM
;
return
-
EPERM
;
rc
=
proc_dointvec_minmax
(
table
,
write
,
buffer
,
lenp
,
ppos
);
if
(
rc
)
return
rc
;
/* Lock the max value if it ever gets set. */
/* Lock the max value if it ever gets set. */
if
(
write
&&
*
(
int
*
)
table
->
data
==
*
(
int
*
)
table
->
extra2
)
table_copy
=
*
table
;
table
->
extra1
=
table
->
extra2
;
if
(
*
(
int
*
)
table_copy
.
data
==
*
(
int
*
)
table_copy
.
extra2
)
table_copy
.
extra1
=
table_copy
.
extra2
;
return
rc
;
return
proc_dointvec_minmax
(
&
table_copy
,
write
,
buffer
,
lenp
,
ppos
)
;
}
}
static
int
zero
;
static
int
zero
;
...
...
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