Patchwork Fix error return for setsockopt(SO_TIMESTAMPING)

login
register
mail settings
Submitter Rémi Denis-Courmont
Date July 20, 2009, 10:47 a.m.
Message ID <1248086824-18836-1-git-send-email-remi.denis-courmont@nokia.com>
Download mbox | patch
Permalink /patch/30003/
State Accepted
Delegated to: David Miller
Headers show

Comments

Rémi Denis-Courmont - July 20, 2009, 10:47 a.m.
From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

I guess it should be -EINVAL rather than EINVAL. I have not checked
when the bug came in. Perhaps a candidate for -stable?

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 net/core/sock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - July 20, 2009, 3:24 p.m.
From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Mon, 20 Jul 2009 13:47:04 +0300

> From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
> 
> I guess it should be -EINVAL rather than EINVAL. I have not checked
> when the bug came in. Perhaps a candidate for -stable?
> 
> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/core/sock.c b/net/core/sock.c
index 6354863..73b5af5 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -631,7 +631,7 @@  set_rcvbuf:
 
 	case SO_TIMESTAMPING:
 		if (val & ~SOF_TIMESTAMPING_MASK) {
-			ret = EINVAL;
+			ret = -EINVAL;
 			break;
 		}
 		sock_valbool_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE,