Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 765be835b06c2cedf80923dda6d6309d509c2502..0d91f7dca751efc3e32348ba217c29e8ed55e80b 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -872,7 +872,8 @@ set_rcvbuf:
 
                if (val & SOF_TIMESTAMPING_OPT_ID &&
                    !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {
-                       if (sk->sk_protocol == IPPROTO_TCP) {
+                       if (sk->sk_protocol == IPPROTO_TCP &&
+                           sk->sk_type == SOCK_STREAM) {
                                if (sk->sk_state != TCP_ESTABLISHED) {
                                        ret = -EINVAL;
                                        break;