]> err.no Git - linux-2.6/commitdiff
[PATCH] net/sunrpc/svcsock.c: fix a check
authorAdrian Bunk <bunk@stusta.de>
Thu, 5 Apr 2007 02:08:21 +0000 (19:08 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 5 Apr 2007 04:12:47 +0000 (21:12 -0700)
The return value of kernel_recvmsg() should be assigned to "err", not
compared with the random value of a never initialized "err" (and the "< 0"
check wrongly always returned false since == comparisons never have a
result < 0).

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
net/sunrpc/svcsock.c

index f6e1eb1ea7201dc3796b0058701af81627f7761d..593f62ff8521e1f502f7af6ea68cccd39a7b68fa 100644 (file)
@@ -779,8 +779,8 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
        }
 
        clear_bit(SK_DATA, &svsk->sk_flags);
-       while ((err == kernel_recvmsg(svsk->sk_sock, &msg, NULL,
-                                     0, 0, MSG_PEEK | MSG_DONTWAIT)) < 0 ||
+       while ((err = kernel_recvmsg(svsk->sk_sock, &msg, NULL,
+                                    0, 0, MSG_PEEK | MSG_DONTWAIT)) < 0 ||
               (skb = skb_recv_datagram(svsk->sk_sk, 0, 1, &err)) == NULL) {
                if (err == -EAGAIN) {
                        svc_sock_received(svsk);