summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2016-05-13 06:14:37 -0700
committerDavid S. Miller <davem@davemloft.net>2016-05-16 13:46:23 -0400
commit2632616bc484de9281bc2a1f5b033325783f8a10 (patch)
treeb88e37332b1bb08239b5664e72e82f84f51d15d7 /net
parenta986a05de95b730fd6a00b2b2f82a06d917fd6a2 (diff)
downloadop-kernel-dev-2632616bc484de9281bc2a1f5b033325783f8a10.zip
op-kernel-dev-2632616bc484de9281bc2a1f5b033325783f8a10.tar.gz
sock: propagate __sock_cmsg_send() error
__sock_cmsg_send() might return different error codes, not only -EINVAL. Fixes: 24025c465f77 ("ipv4: process socket-level control messages in IPv4") Fixes: ad1e46a83716 ("ipv6: process socket-level control messages in IPv6") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Soheil Hassas Yeganeh <soheil@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_sockglue.c5
-rw-r--r--net/ipv6/datagram.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 5805762..71a52f4d 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -247,8 +247,9 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
}
#endif
if (cmsg->cmsg_level == SOL_SOCKET) {
- if (__sock_cmsg_send(sk, msg, cmsg, &ipc->sockc))
- return -EINVAL;
+ err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc);
+ if (err)
+ return err;
continue;
}
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 00d0c29..37874e2 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -746,8 +746,9 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
}
if (cmsg->cmsg_level == SOL_SOCKET) {
- if (__sock_cmsg_send(sk, msg, cmsg, sockc))
- return -EINVAL;
+ err = __sock_cmsg_send(sk, msg, cmsg, sockc);
+ if (err)
+ return err;
continue;
}
OpenPOWER on IntegriCloud