]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
SUNRPC: fix ternary sign expansion bug in tracing
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 22 Apr 2021 09:14:37 +0000 (12:14 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:56:26 +0000 (10:56 +0200)
[ Upstream commit cb579086536f6564f5846f89808ec394ef8b8621 ]

This code is supposed to pass negative "err" values for tracing but it
passes positive values instead.  The problem is that the
trace_svcsock_tcp_send() function takes a long but "err" is an int and
"sent" is a u32.  The negative is first type promoted to u32 so it
becomes a high positive then it is promoted to long and it stays
positive.

Fix this by casting "err" directly to long.

Fixes: 998024dee197 ("SUNRPC: Add more svcsock tracepoints")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sunrpc/svcsock.c

index 2e2f007dfc9f1ff9d5e367f97bc1d0480e9ab506..7cde41a936a433fc4bbade722a9e5aed9fe6b295 100644 (file)
@@ -1171,7 +1171,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp)
        tcp_sock_set_cork(svsk->sk_sk, true);
        err = svc_tcp_sendmsg(svsk->sk_sock, xdr, marker, &sent);
        xdr_free_bvec(xdr);
-       trace_svcsock_tcp_send(xprt, err < 0 ? err : sent);
+       trace_svcsock_tcp_send(xprt, err < 0 ? (long)err : sent);
        if (err < 0 || sent != (xdr->len + sizeof(marker)))
                goto out_close;
        if (atomic_dec_and_test(&svsk->sk_sendqlen))