socket: fix compat SO_RCVTIMEO_NEW/SO_SNDTIMEO_NEW (e6986423) · Commits · 戴 / test

It looks like the new socket options only work correctly for native execution, but in case of compat mode fall back to the old behavior as we ignore the 'old_timeval' flag. Rework so we treat SO_RCVTIMEO_NEW/SO_SNDTIMEO_NEW the same way in compat and native 32-bit mode. Cc: Deepa Dinamani <deepa.kernel@gmail.com> Fixes: ("sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW") Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Acked-by:

Deepa Dinamani <deepa.kernel@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/sock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
		tv.tv_usec = ((timeo % HZ) * USEC_PER_SEC) / HZ;
		}

		if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
		if (old_timeval && in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
		struct old_timeval32 tv32 = { tv.tv_sec, tv.tv_usec };
		(struct old_timeval32 )optval = tv32;
		return sizeof(tv32);
		@@ -372,7 +372,7 @@ static int sock_set_timeout(long timeo_p, char __user optval, int optlen, bool
		{
		struct __kernel_sock_timeval tv;

		if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
		if (old_timeval && in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
		struct old_timeval32 tv32;

		if (optlen < sizeof(tv32))

Admin message