Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
ca6c026a
Commit
ca6c026a
authored
Jul 01, 2013
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check: Netlink diag and peek-siginfo is in 3.10 already
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
00be48d5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
cr-check.c
cr-check.c
+0
-5
sockets.c
sockets.c
+2
-7
No files found.
cr-check.c
View file @
ca6c026a
...
@@ -469,11 +469,6 @@ int check_ptrace_peeksiginfo()
...
@@ -469,11 +469,6 @@ int check_ptrace_peeksiginfo()
siginfo_t
siginfo
;
siginfo_t
siginfo
;
pid_t
pid
,
ret
=
0
;
pid_t
pid
,
ret
=
0
;
if
(
opts
.
check_ms_kernel
)
{
pr_warn
(
"Skipping peeking siginfos check (not yet merged)
\n
"
);
return
0
;
}
pid
=
fork
();
pid
=
fork
();
if
(
pid
<
0
)
if
(
pid
<
0
)
pr_perror
(
"fork"
);
pr_perror
(
"fork"
);
...
...
sockets.c
View file @
ca6c026a
...
@@ -618,21 +618,16 @@ int collect_sockets(int pid)
...
@@ -618,21 +618,16 @@ int collect_sockets(int pid)
err
=
tmp
;
err
=
tmp
;
}
}
if
(
pid
==
0
&&
opts
.
check_ms_kernel
)
{
pr_warn
(
"Skipping netling diag check (not yet merged)
\n
"
);
goto
skip
;
}
req
.
r
.
n
.
sdiag_family
=
AF_NETLINK
;
req
.
r
.
n
.
sdiag_family
=
AF_NETLINK
;
req
.
r
.
n
.
sdiag_protocol
=
NDIAG_PROTO_ALL
;
req
.
r
.
n
.
sdiag_protocol
=
NDIAG_PROTO_ALL
;
req
.
r
.
n
.
ndiag_show
=
NDIAG_SHOW_GROUPS
;
req
.
r
.
n
.
ndiag_show
=
NDIAG_SHOW_GROUPS
;
tmp
=
do_collect_req
(
nl
,
&
req
,
sizeof
(
req
),
netlink_receive_one
,
NULL
);
tmp
=
do_collect_req
(
nl
,
&
req
,
sizeof
(
req
),
netlink_receive_one
,
NULL
);
if
(
tmp
)
{
if
(
tmp
)
{
pr_warn
(
"The current kernel doesn't support netlink_diag
\n
"
);
pr_warn
(
"The current kernel doesn't support netlink_diag
\n
"
);
if
(
pid
==
0
||
tmp
!=
-
ENOENT
)
/*
Going to be in 3.10
*/
if
(
pid
==
0
||
tmp
!=
-
ENOENT
)
/*
Fedora 19
*/
err
=
tmp
;
err
=
tmp
;
}
}
skip:
close
(
nl
);
close
(
nl
);
out:
out:
if
(
rst
>=
0
)
{
if
(
rst
>=
0
)
{
...
...
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