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
nexedi
linux
Commits
8d31a5c3
Commit
8d31a5c3
authored
May 06, 2019
by
James Morris
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'smack-for-5.2-b' of
https://github.com/cschaufler/next-smack
into next-smack
Smack: Fix kbuild reported build error
parents
5f9b4992
619ae03e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
security/smack/smack_lsm.c
security/smack/smack_lsm.c
+2
-0
No files found.
security/smack/smack_lsm.c
View file @
8d31a5c3
...
@@ -3693,6 +3693,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
...
@@ -3693,6 +3693,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
return
-
EINVAL
;
return
-
EINVAL
;
rc
=
smack_netlabel_send
(
sock
->
sk
,
sip
);
rc
=
smack_netlabel_send
(
sock
->
sk
,
sip
);
break
;
break
;
#if IS_ENABLED(CONFIG_IPV6)
case
AF_INET6
:
case
AF_INET6
:
if
(
msg
->
msg_namelen
<
SIN6_LEN_RFC2133
||
if
(
msg
->
msg_namelen
<
SIN6_LEN_RFC2133
||
sap
->
sin6_family
!=
AF_INET6
)
sap
->
sin6_family
!=
AF_INET6
)
...
@@ -3706,6 +3707,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
...
@@ -3706,6 +3707,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
#ifdef SMACK_IPV6_PORT_LABELING
#ifdef SMACK_IPV6_PORT_LABELING
rc
=
smk_ipv6_port_check
(
sock
->
sk
,
sap
,
SMK_SENDING
);
rc
=
smk_ipv6_port_check
(
sock
->
sk
,
sap
,
SMK_SENDING
);
#endif
#endif
#endif
/* IS_ENABLED(CONFIG_IPV6) */
break
;
break
;
}
}
return
rc
;
return
rc
;
...
...
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