Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
0e94c25c
Commit
0e94c25c
authored
Mar 05, 2020
by
Marcus Nordenberg
Committed by
Esteban Blanc
Dec 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix capabilities for sev/rt_ini
(cherry picked from commit d8d42faca720574c6bc915e7e857a8a8a66d7f58)
parent
e74a3b7f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
4 deletions
+15
-4
sev/exe/sev_ini/src/sev_ini.c
sev/exe/sev_ini/src/sev_ini.c
+7
-1
src/exe/rt_ini/src/rt_ini.c
src/exe/rt_ini/src/rt_ini.c
+6
-0
src/tools/pkg/deb_x86_64/pwrrt/postinst
src/tools/pkg/deb_x86_64/pwrrt/postinst
+1
-1
src/tools/pkg/deb_x86_64/pwrrt/pwr.service
src/tools/pkg/deb_x86_64/pwrrt/pwr.service
+0
-1
src/tools/pkg/deb_x86_64/pwrsev/postinst
src/tools/pkg/deb_x86_64/pwrsev/postinst
+1
-1
No files found.
sev/exe/sev_ini/src/sev_ini.c
View file @
0e94c25c
...
@@ -34,11 +34,13 @@
...
@@ -34,11 +34,13 @@
* General Public License plus this exception.
* General Public License plus this exception.
*/
*/
// TODO: Den h
r filen
r i princip identisk med rt_ini.
// TODO: Den h
�r filen �
r i princip identisk med rt_ini.
#include <fcntl.h>
#include <fcntl.h>
#include <unistd.h>
#include <unistd.h>
#include <sys/wait.h>
#include <sys/wait.h>
#include <sys/prctl.h>
#include <linux/capability.h>
#include "co_dcli.h"
#include "co_dcli.h"
#include "co_string.h"
#include "co_string.h"
...
@@ -73,6 +75,10 @@ int main(int argc, char** argv)
...
@@ -73,6 +75,10 @@ int main(int argc, char** argv)
if
(
cp
->
flags
.
b
.
stop
)
{
if
(
cp
->
flags
.
b
.
stop
)
{
sts
=
stop
(
argc
,
argv
,
cp
);
sts
=
stop
(
argc
,
argv
,
cp
);
}
else
{
}
else
{
// Set our ambient set so that our currently cap unaware processes may inherit and set the effective bit
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_ADMIN
,
0
,
0
);
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_BROADCAST
,
0
,
0
);
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_RAW
,
0
,
0
);
sts
=
start
(
cp
);
sts
=
start
(
cp
);
sts
=
events
(
cp
);
sts
=
events
(
cp
);
errh_LogInfo
(
&
cp
->
log
,
"Ich sterbe!!"
);
errh_LogInfo
(
&
cp
->
log
,
"Ich sterbe!!"
);
...
...
src/exe/rt_ini/src/rt_ini.c
View file @
0e94c25c
...
@@ -40,6 +40,8 @@
...
@@ -40,6 +40,8 @@
#include <sys/stat.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/wait.h>
#include <sys/prctl.h>
#include <linux/capability.h>
#include "co_dcli.h"
#include "co_dcli.h"
#include "co_string.h"
#include "co_string.h"
...
@@ -1718,4 +1720,8 @@ static void daemonize()
...
@@ -1718,4 +1720,8 @@ static void daemonize()
stdout
=
fopen
(
"/dev/null"
,
"w+"
);
stdout
=
fopen
(
"/dev/null"
,
"w+"
);
stderr
=
fopen
(
"/dev/null"
,
"w+"
);
stderr
=
fopen
(
"/dev/null"
,
"w+"
);
// Set our ambient set so that our currently cap unaware processes may inherit and set the effective bit
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_ADMIN
,
0
,
0
);
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_BROADCAST
,
0
,
0
);
prctl
(
PR_CAP_AMBIENT
,
PR_CAP_AMBIENT_RAISE
,
CAP_NET_RAW
,
0
,
0
);
}
}
src/tools/pkg/deb_x86_64/pwrrt/postinst
View file @
0e94c25c
...
@@ -115,7 +115,7 @@ fi
...
@@ -115,7 +115,7 @@ fi
chown
-R
pwrp /usr/pwrrt
chown
-R
pwrp /usr/pwrrt
chgrp
-R
pwrp /usr/pwrrt
chgrp
-R
pwrp /usr/pwrrt
setcap cap_net_admin,cap_net_raw,cap_net_broadcast+eip /usr/pwrrt/exe/rt_ini
setcap cap_
setpcap,cap_
net_admin,cap_net_raw,cap_net_broadcast+eip /usr/pwrrt/exe/rt_ini
#chmod u+s /usr/pwrrt/exe/rt_ini
#chmod u+s /usr/pwrrt/exe/rt_ini
#chmod u+s /usr/pwrrt/exe/rt_rtt
#chmod u+s /usr/pwrrt/exe/rt_rtt
...
...
src/tools/pkg/deb_x86_64/pwrrt/pwr.service
View file @
0e94c25c
...
@@ -9,7 +9,6 @@ EnvironmentFile=-/pwrp/common/load/pwr_environment
...
@@ -9,7 +9,6 @@ EnvironmentFile=-/pwrp/common/load/pwr_environment
Type=forking
Type=forking
Restart=no
Restart=no
TimeoutSec=15
TimeoutSec=15
AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BROADCAST
# TODO Share private tmp with rt_xtt
# TODO Share private tmp with rt_xtt
PrivateTmp=no
PrivateTmp=no
KillMode=control-group
KillMode=control-group
...
...
src/tools/pkg/deb_x86_64/pwrsev/postinst
View file @
0e94c25c
...
@@ -115,7 +115,7 @@ fi
...
@@ -115,7 +115,7 @@ fi
chown
-R
pwrp /usr/pwrsev
chown
-R
pwrp /usr/pwrsev
chgrp
-R
pwrp /usr/pwrsev
chgrp
-R
pwrp /usr/pwrsev
setcap cap_net_admin,cap_net_raw,cap_net_broadcast+eip /usr/pwrsev/exe/sev_ini
setcap cap_net_admin,cap_net_raw,cap_net_broadcast
,cap_setpcap
+eip /usr/pwrsev/exe/sev_ini
# Source pwrp_profile in login shells
# Source pwrp_profile in login shells
if
[
!
-e
/etc/profile/pwrp_profile.sh
]
;
then
if
[
!
-e
/etc/profile/pwrp_profile.sh
]
;
then
...
...
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