Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af6d5721 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

svcrpc: don't bother checking bad svc_addr_len result 



None of the callers should see an unsupported address family (only one
of them even bothers to check for that case), so just check for the
buggy case in svc_addr_len and don't bother elsewhere.

Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent f23abfdb

include/linux/sunrpc/svc_xprt.h

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ static inline size_t svc_addr_len(const struct sockaddr *sa) 
	case AF_INET6:

		return sizeof(struct sockaddr_in6);

	}



	return 0;

	BUG();

}



static inline unsigned short svc_xprt_local_port(const struct svc_xprt *xprt)

net/sunrpc/svcsock.c

+0 −2
Original line number Diff line number Diff line
@@ -601,8 +601,6 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp) 
		return -EAGAIN;

	}

	len = svc_addr_len(svc_addr(rqstp));

	if (len == 0)

		return -EAFNOSUPPORT;

	rqstp->rq_addrlen = len;

	if (skb->tstamp.tv64 == 0) {

		skb->tstamp = ktime_get_real();