Re: [PATCH] net-next: Fix minor code bug in timestamping.txt

2017-07-11 Thread David Miller
From: Ahmad Fatoum 
Date: Sat,  8 Jul 2017 21:28:44 +0200

> Passing (void*)val instead of  would make a pointer out of an integer
> and cause sock_setsockopt to -EFAULT.
> 
> See tools/testing/selftests/networking/timestamping/timestamping.c
> for a working example.
> 
> Cc: David S. Miller 
> Cc: netdev@vger.kernel.org
> Signed-off-by: Ahmad Fatoum 

Applied.


[PATCH] net-next: Fix minor code bug in timestamping.txt

2017-07-08 Thread Ahmad Fatoum
Passing (void*)val instead of  would make a pointer out of an integer
and cause sock_setsockopt to -EFAULT.

See tools/testing/selftests/networking/timestamping/timestamping.c
for a working example.

Cc: David S. Miller 
Cc: netdev@vger.kernel.org
Signed-off-by: Ahmad Fatoum 
---
 Documentation/networking/timestamping.txt | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Documentation/networking/timestamping.txt 
b/Documentation/networking/timestamping.txt
index 196ba17cc344..1be0b6f9e0cb 100644
--- a/Documentation/networking/timestamping.txt
+++ b/Documentation/networking/timestamping.txt
@@ -44,8 +44,7 @@ timeval of SO_TIMESTAMP (ms).
 Supports multiple types of timestamp requests. As a result, this
 socket option takes a bitmap of flags, not a boolean. In
 
-  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, (void *) val,
-   sizeof(val));
+  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, , sizeof(val));
 
 val is an integer with any of the following bits set. Setting other
 bit returns EINVAL and does not change the current state.
@@ -249,8 +248,7 @@ setsockopt to receive timestamps:
 
   __u32 val = SOF_TIMESTAMPING_SOFTWARE |
  SOF_TIMESTAMPING_OPT_ID /* or any other flag */;
-  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, (void *) val,
-   sizeof(val));
+  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, , sizeof(val));
 
 
 1.4 Bytestream Timestamps
-- 
2.13.2