1 files changed, 10 insertions, 6 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 29be035f9c65..df923caa8389 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2277,13 +2277,15 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state)
         size_t size = state->size;
         unsigned int last_len;
 
-        err = -EINVAL;
-        if (sk->sk_state != TCP_ESTABLISHED)
+        if (unlikely(sk->sk_state != TCP_ESTABLISHED)) {
+                err = -EINVAL;
                 goto out;
+        }
 
-        err = -EOPNOTSUPP;
-        if (flags & MSG_OOB)
+        if (unlikely(flags & MSG_OOB)) {
+                err = -EOPNOTSUPP;
                 goto out;
+        }
 
         target = sock_rcvlowat(sk, flags & MSG_WAITALL, size);
         timeo = sock_rcvtimeo(sk, noblock);
@@ -2329,9 +2331,11 @@ again:
                                 goto unlock;
 
                         unix_state_unlock(sk);
-                        err = -EAGAIN;
-                        if (!timeo)
+                        if (!timeo) {
+                                err = -EAGAIN;
                                 break;
+                        }
+
                         mutex_unlock(&u->readlock);
 
                         timeo = unix_stream_data_wait(sk, timeo, last,