Message ID | 1469052078-31269-1-git-send-email-soheil.kdev@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Soheil Hassas Yeganeh <soheil.kdev@gmail.com> Date: Wed, 20 Jul 2016 18:01:18 -0400 > From: Soheil Hassas Yeganeh <soheil@google.com> > > sock_cmsg_send() can return different error codes and not only > -EINVAL, and we should properly propagate them. > > Fixes: c14ac9451c34 ("sock: enable timestamping using control messages") > Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> > Cc: Willem de Bruijn <willemb@google.com> Applied, thanks.
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 53e87ce..b43c401 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1930,10 +1930,8 @@ retry: sockc.tsflags = sk->sk_tsflags; if (msg->msg_controllen) { err = sock_cmsg_send(sk, msg, &sockc); - if (unlikely(err)) { - err = -EINVAL; + if (unlikely(err)) goto out_unlock; - } } skb->protocol = proto;