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
156d9ed1
Commit
156d9ed1
authored
Jul 09, 2017
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msgctl(): split the actual work from copyin/copyout
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
553f770e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
96 additions
and
106 deletions
+96
-106
ipc/msg.c
ipc/msg.c
+96
-106
No files found.
ipc/msg.c
View file @
156d9ed1
...
@@ -361,23 +361,17 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
...
@@ -361,23 +361,17 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
* NOTE: no locks must be held, the rwsem is taken inside this function.
* NOTE: no locks must be held, the rwsem is taken inside this function.
*/
*/
static
int
msgctl_down
(
struct
ipc_namespace
*
ns
,
int
msqid
,
int
cmd
,
static
int
msgctl_down
(
struct
ipc_namespace
*
ns
,
int
msqid
,
int
cmd
,
struct
msqid_ds
__user
*
buf
,
int
version
)
struct
msqid64_ds
*
msqid64
)
{
{
struct
kern_ipc_perm
*
ipcp
;
struct
kern_ipc_perm
*
ipcp
;
struct
msqid64_ds
uninitialized_var
(
msqid64
);
struct
msg_queue
*
msq
;
struct
msg_queue
*
msq
;
int
err
;
int
err
;
if
(
cmd
==
IPC_SET
)
{
if
(
copy_msqid_from_user
(
&
msqid64
,
buf
,
version
))
return
-
EFAULT
;
}
down_write
(
&
msg_ids
(
ns
).
rwsem
);
down_write
(
&
msg_ids
(
ns
).
rwsem
);
rcu_read_lock
();
rcu_read_lock
();
ipcp
=
ipcctl_pre_down_nolock
(
ns
,
&
msg_ids
(
ns
),
msqid
,
cmd
,
ipcp
=
ipcctl_pre_down_nolock
(
ns
,
&
msg_ids
(
ns
),
msqid
,
cmd
,
&
msqid64
.
msg_perm
,
msqid64
.
msg_qbytes
);
&
msqid64
->
msg_perm
,
msqid64
->
msg_qbytes
);
if
(
IS_ERR
(
ipcp
))
{
if
(
IS_ERR
(
ipcp
))
{
err
=
PTR_ERR
(
ipcp
);
err
=
PTR_ERR
(
ipcp
);
goto
out_unlock1
;
goto
out_unlock1
;
...
@@ -399,18 +393,18 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
...
@@ -399,18 +393,18 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
{
{
DEFINE_WAKE_Q
(
wake_q
);
DEFINE_WAKE_Q
(
wake_q
);
if
(
msqid64
.
msg_qbytes
>
ns
->
msg_ctlmnb
&&
if
(
msqid64
->
msg_qbytes
>
ns
->
msg_ctlmnb
&&
!
capable
(
CAP_SYS_RESOURCE
))
{
!
capable
(
CAP_SYS_RESOURCE
))
{
err
=
-
EPERM
;
err
=
-
EPERM
;
goto
out_unlock1
;
goto
out_unlock1
;
}
}
ipc_lock_object
(
&
msq
->
q_perm
);
ipc_lock_object
(
&
msq
->
q_perm
);
err
=
ipc_update_perm
(
&
msqid64
.
msg_perm
,
ipcp
);
err
=
ipc_update_perm
(
&
msqid64
->
msg_perm
,
ipcp
);
if
(
err
)
if
(
err
)
goto
out_unlock0
;
goto
out_unlock0
;
msq
->
q_qbytes
=
msqid64
.
msg_qbytes
;
msq
->
q_qbytes
=
msqid64
->
msg_qbytes
;
msq
->
q_ctime
=
get_seconds
();
msq
->
q_ctime
=
get_seconds
();
/*
/*
...
@@ -442,22 +436,12 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
...
@@ -442,22 +436,12 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
return
err
;
return
err
;
}
}
static
int
msgctl_
nolock
(
struct
ipc_namespace
*
ns
,
int
msqid
,
static
int
msgctl_
info
(
struct
ipc_namespace
*
ns
,
int
msqid
,
int
cmd
,
int
version
,
void
__user
*
buf
)
int
cmd
,
struct
msginfo
*
msginfo
)
{
{
int
err
;
int
err
;
struct
msg_queue
*
msq
;
switch
(
cmd
)
{
case
IPC_INFO
:
case
MSG_INFO
:
{
struct
msginfo
msginfo
;
int
max_id
;
int
max_id
;
if
(
!
buf
)
return
-
EFAULT
;
/*
/*
* We must not return kernel stack data.
* We must not return kernel stack data.
* due to padding, it's not enough
* due to padding, it's not enough
...
@@ -467,39 +451,35 @@ static int msgctl_nolock(struct ipc_namespace *ns, int msqid,
...
@@ -467,39 +451,35 @@ static int msgctl_nolock(struct ipc_namespace *ns, int msqid,
if
(
err
)
if
(
err
)
return
err
;
return
err
;
memset
(
&
msginfo
,
0
,
sizeof
(
msginfo
));
memset
(
msginfo
,
0
,
sizeof
(
*
msginfo
));
msginfo
.
msgmni
=
ns
->
msg_ctlmni
;
msginfo
->
msgmni
=
ns
->
msg_ctlmni
;
msginfo
.
msgmax
=
ns
->
msg_ctlmax
;
msginfo
->
msgmax
=
ns
->
msg_ctlmax
;
msginfo
.
msgmnb
=
ns
->
msg_ctlmnb
;
msginfo
->
msgmnb
=
ns
->
msg_ctlmnb
;
msginfo
.
msgssz
=
MSGSSZ
;
msginfo
->
msgssz
=
MSGSSZ
;
msginfo
.
msgseg
=
MSGSEG
;
msginfo
->
msgseg
=
MSGSEG
;
down_read
(
&
msg_ids
(
ns
).
rwsem
);
down_read
(
&
msg_ids
(
ns
).
rwsem
);
if
(
cmd
==
MSG_INFO
)
{
if
(
cmd
==
MSG_INFO
)
{
msginfo
.
msgpool
=
msg_ids
(
ns
).
in_use
;
msginfo
->
msgpool
=
msg_ids
(
ns
).
in_use
;
msginfo
.
msgmap
=
atomic_read
(
&
ns
->
msg_hdrs
);
msginfo
->
msgmap
=
atomic_read
(
&
ns
->
msg_hdrs
);
msginfo
.
msgtql
=
atomic_read
(
&
ns
->
msg_bytes
);
msginfo
->
msgtql
=
atomic_read
(
&
ns
->
msg_bytes
);
}
else
{
}
else
{
msginfo
.
msgmap
=
MSGMAP
;
msginfo
->
msgmap
=
MSGMAP
;
msginfo
.
msgpool
=
MSGPOOL
;
msginfo
->
msgpool
=
MSGPOOL
;
msginfo
.
msgtql
=
MSGTQL
;
msginfo
->
msgtql
=
MSGTQL
;
}
}
max_id
=
ipc_get_maxid
(
&
msg_ids
(
ns
));
max_id
=
ipc_get_maxid
(
&
msg_ids
(
ns
));
up_read
(
&
msg_ids
(
ns
).
rwsem
);
up_read
(
&
msg_ids
(
ns
).
rwsem
);
if
(
copy_to_user
(
buf
,
&
msginfo
,
sizeof
(
struct
msginfo
)))
return
-
EFAULT
;
return
(
max_id
<
0
)
?
0
:
max_id
;
return
(
max_id
<
0
)
?
0
:
max_id
;
}
}
case
MSG_STAT
:
static
int
msgctl_stat
(
struct
ipc_namespace
*
ns
,
int
msqid
,
case
IPC_STAT
:
int
cmd
,
struct
msqid64_ds
*
p
)
{
{
struct
msqid64_ds
tbuf
;
int
err
;
struct
msg_queue
*
msq
;
int
success_return
;
int
success_return
;
if
(
!
buf
)
memset
(
p
,
0
,
sizeof
(
*
p
));
return
-
EFAULT
;
memset
(
&
tbuf
,
0
,
sizeof
(
tbuf
));
rcu_read_lock
();
rcu_read_lock
();
if
(
cmd
==
MSG_STAT
)
{
if
(
cmd
==
MSG_STAT
)
{
...
@@ -526,27 +506,19 @@ static int msgctl_nolock(struct ipc_namespace *ns, int msqid,
...
@@ -526,27 +506,19 @@ static int msgctl_nolock(struct ipc_namespace *ns, int msqid,
if
(
err
)
if
(
err
)
goto
out_unlock
;
goto
out_unlock
;
kernel_to_ipc64_perm
(
&
msq
->
q_perm
,
&
tbuf
.
msg_perm
);
kernel_to_ipc64_perm
(
&
msq
->
q_perm
,
&
p
->
msg_perm
);
tbuf
.
msg_stime
=
msq
->
q_stime
;
p
->
msg_stime
=
msq
->
q_stime
;
tbuf
.
msg_rtime
=
msq
->
q_rtime
;
p
->
msg_rtime
=
msq
->
q_rtime
;
tbuf
.
msg_ctime
=
msq
->
q_ctime
;
p
->
msg_ctime
=
msq
->
q_ctime
;
tbuf
.
msg_cbytes
=
msq
->
q_cbytes
;
p
->
msg_cbytes
=
msq
->
q_cbytes
;
tbuf
.
msg_qnum
=
msq
->
q_qnum
;
p
->
msg_qnum
=
msq
->
q_qnum
;
tbuf
.
msg_qbytes
=
msq
->
q_qbytes
;
p
->
msg_qbytes
=
msq
->
q_qbytes
;
tbuf
.
msg_lspid
=
msq
->
q_lspid
;
p
->
msg_lspid
=
msq
->
q_lspid
;
tbuf
.
msg_lrpid
=
msq
->
q_lrpid
;
p
->
msg_lrpid
=
msq
->
q_lrpid
;
rcu_read_unlock
();
rcu_read_unlock
();
if
(
copy_msqid_to_user
(
buf
,
&
tbuf
,
version
))
return
-
EFAULT
;
return
success_return
;
return
success_return
;
}
default:
return
-
EINVAL
;
}
return
err
;
out_unlock:
out_unlock:
rcu_read_unlock
();
rcu_read_unlock
();
return
err
;
return
err
;
...
@@ -556,6 +528,8 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
...
@@ -556,6 +528,8 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
{
{
int
version
;
int
version
;
struct
ipc_namespace
*
ns
;
struct
ipc_namespace
*
ns
;
struct
msqid64_ds
msqid64
;
int
err
;
if
(
msqid
<
0
||
cmd
<
0
)
if
(
msqid
<
0
||
cmd
<
0
)
return
-
EINVAL
;
return
-
EINVAL
;
...
@@ -565,13 +539,29 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
...
@@ -565,13 +539,29 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
switch
(
cmd
)
{
switch
(
cmd
)
{
case
IPC_INFO
:
case
IPC_INFO
:
case
MSG_INFO
:
case
MSG_INFO
:
{
struct
msginfo
msginfo
;
err
=
msgctl_info
(
ns
,
msqid
,
cmd
,
&
msginfo
);
if
(
err
<
0
)
return
err
;
if
(
copy_to_user
(
buf
,
&
msginfo
,
sizeof
(
struct
msginfo
)))
err
=
-
EFAULT
;
return
err
;
}
case
MSG_STAT
:
/* msqid is an index rather than a msg queue id */
case
MSG_STAT
:
/* msqid is an index rather than a msg queue id */
case
IPC_STAT
:
case
IPC_STAT
:
return
msgctl_nolock
(
ns
,
msqid
,
cmd
,
version
,
buf
);
err
=
msgctl_stat
(
ns
,
msqid
,
cmd
,
&
msqid64
);
if
(
err
<
0
)
return
err
;
if
(
copy_msqid_to_user
(
buf
,
&
msqid64
,
version
))
err
=
-
EFAULT
;
return
err
;
case
IPC_SET
:
case
IPC_SET
:
if
(
copy_msqid_from_user
(
&
msqid64
,
buf
,
version
))
return
-
EFAULT
;
/* fallthru */
case
IPC_RMID
:
case
IPC_RMID
:
return
msgctl_down
(
ns
,
msqid
,
cmd
,
buf
,
version
);
return
msgctl_down
(
ns
,
msqid
,
cmd
,
&
msqid64
);
default:
default:
return
-
EINVAL
;
return
-
EINVAL
;
}
}
...
...
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