]> git.baikalelectronics.ru Git - kernel.git/commit
net: socket: fix recvmmsg not returning error from sock_error
authorMaxime Jayat <maxime.jayat@mobile-devices.fr>
Tue, 21 Feb 2017 17:35:51 +0000 (18:35 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2017 18:35:25 +0000 (13:35 -0500)
commit387be467a08088675e0b85a343e5510e178d0a9f
treeca058ad03810888c1dbf17cbc6f3328835c7a42e
parent15fee38c6560fd215a0c8a06cbf27bb1071f11a2
net: socket: fix recvmmsg not returning error from sock_error

Commit b054cf52e1b8 ("net: Fix use after free in the recvmmsg exit path"),
changed the exit path of recvmmsg to always return the datagrams
variable and modified the error paths to set the variable to the error
code returned by recvmsg if necessary.

However in the case sock_error returned an error, the error code was
then ignored, and recvmmsg returned 0.

Change the error path of recvmmsg to correctly return the error code
of sock_error.

The bug was triggered by using recvmmsg on a CAN interface which was
not up. Linux 4.6 and later return 0 in this case while earlier
releases returned -ENETDOWN.

Fixes: b054cf52e1b8 ("net: Fix use after free in the recvmmsg exit path")
Signed-off-by: Maxime Jayat <maxime.jayat@mobile-devices.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/socket.c