Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xenomai
xenomai
Commits
78f32e29
Commit
78f32e29
authored
Dec 05, 2017
by
Philippe Gerum
Browse files
net/packet: recvmsg: write back namelen only if name required
parent
db8bfc34
Changes
1
Hide whitespace changes
Inline
Side-by-side
kernel/drivers/net/stack/packet/af_packet.c
View file @
78f32e29
...
...
@@ -351,12 +351,6 @@ rt_packet_recvmsg(struct rtdm_fd *fd, struct user_msghdr *u_msg, int msg_flags)
rtskb
=
rtskb_dequeue_chain
(
&
sock
->
incoming
);
RTNET_ASSERT
(
rtskb
!=
NULL
,
return
-
EFAULT
;);
/* copy the address */
namelen
=
sizeof
(
sll
);
ret
=
rtnet_put_arg
(
fd
,
&
msg
->
msg_namelen
,
&
namelen
,
sizeof
(
namelen
));
if
(
ret
)
goto
fail
;
/* copy the address if required. */
if
(
msg
->
msg_name
)
{
struct
rtnet_device
*
rtdev
=
rtskb
->
rtdev
;
...
...
@@ -373,6 +367,11 @@ rt_packet_recvmsg(struct rtdm_fd *fd, struct user_msghdr *u_msg, int msg_flags)
ret
=
rtnet_put_arg
(
fd
,
msg
->
msg_name
,
&
sll
,
sizeof
(
sll
));
if
(
ret
)
goto
fail
;
namelen
=
sizeof
(
sll
);
ret
=
rtnet_put_arg
(
fd
,
&
u_msg
->
msg_namelen
,
&
namelen
,
sizeof
(
namelen
));
if
(
ret
)
goto
fail
;
}
/* Include the header in raw delivery */
...
...
Write
Preview
Supports
Markdown
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