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

Commit ad06e4bd authored by Chuck Lever's avatar Chuck Lever Committed by Linus Torvalds
Browse files

[PATCH] knfsd: SUNRPC: Add a function to format the address in an svc_rqst for printing 



There are loads of places where the RPC server assumes that the rq_addr fields
contains an IPv4 address.  Top among these are error and debugging messages
that display the server's IP address.

Let's refactor the address printing into a separate function that's smart
enough to figure out the difference between IPv4 and IPv6 addresses.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1ba95105

fs/lockd/svc.c

+3 −3
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ lockd(struct svc_rqst *rqstp) 
	 */

	while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid) {

		long timeout = MAX_SCHEDULE_TIMEOUT;

		char buf[RPC_MAX_ADDRBUFLEN];



		if (signalled()) {

			flush_signals(current);
@@ -175,11 +176,10 @@ lockd(struct svc_rqst *rqstp) 
			break;

		}



		dprintk("lockd: request from %08x\n",

			(unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));

		dprintk("lockd: request from %s\n",

				svc_print_addr(rqstp, buf, sizeof(buf)));



		svc_process(rqstp);



	}



	flush_signals(current);

fs/lockd/svc4proc.c

+3 −4
Original line number Diff line number Diff line
@@ -426,10 +426,9 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
	dprintk("lockd: SM_NOTIFY     called\n");

	if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)

	 || ntohs(saddr.sin_port) >= 1024) {

		printk(KERN_WARNING

			"lockd: rejected NSM callback from %08x:%d\n",

			ntohl(rqstp->rq_addr.sin_addr.s_addr),

			ntohs(rqstp->rq_addr.sin_port));

		char buf[RPC_MAX_ADDRBUFLEN];

		printk(KERN_WARNING "lockd: rejected NSM callback from %s\n",

				svc_print_addr(rqstp, buf, sizeof(buf)));

		return rpc_system_err;

	}

fs/lockd/svcproc.c

+3 −4
Original line number Diff line number Diff line
@@ -457,10 +457,9 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
	dprintk("lockd: SM_NOTIFY     called\n");

	if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)

	 || ntohs(saddr.sin_port) >= 1024) {

		printk(KERN_WARNING

			"lockd: rejected NSM callback from %08x:%d\n",

			ntohl(rqstp->rq_addr.sin_addr.s_addr),

			ntohs(rqstp->rq_addr.sin_port));

		char buf[RPC_MAX_ADDRBUFLEN];

		printk(KERN_WARNING "lockd: rejected NSM callback from %s\n",

				svc_print_addr(rqstp, buf, sizeof(buf)));

		return rpc_system_err;

	}

fs/nfs/callback.c

+9 −3
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static void nfs_callback_svc(struct svc_rqst *rqstp) 
	complete(&nfs_callback_info.started);



	for(;;) {

		char buf[RPC_MAX_ADDRBUFLEN];



		if (signalled()) {

			if (nfs_callback_info.users == 0)

				break;
@@ -88,8 +90,8 @@ static void nfs_callback_svc(struct svc_rqst *rqstp) 
					__FUNCTION__, -err);

			break;

		}

		dprintk("%s: request from %u.%u.%u.%u\n", __FUNCTION__,

				NIPQUAD(rqstp->rq_addr.sin_addr.s_addr));

		dprintk("%s: request from %s\n", __FUNCTION__,

				svc_print_addr(rqstp, buf, sizeof(buf)));

		svc_process(rqstp);

	}
@@ -166,13 +168,17 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp) 
{

	struct sockaddr_in *addr = &rqstp->rq_addr;

	struct nfs_client *clp;

	char buf[RPC_MAX_ADDRBUFLEN];



	/* Don't talk to strangers */

	clp = nfs_find_client(addr, 4);

	if (clp == NULL)

		return SVC_DROP;

	dprintk("%s: %u.%u.%u.%u NFSv4 callback!\n", __FUNCTION__, NIPQUAD(addr->sin_addr));



	dprintk("%s: %s NFSv4 callback!\n", __FUNCTION__,

			svc_print_addr(rqstp, buf, sizeof(buf)));

	nfs_put_client(clp);



	switch (rqstp->rq_authop->flavour) {

		case RPC_AUTH_NULL:

			if (rqstp->rq_proc != CB_NULL)

fs/nfsd/nfsfh.c

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/mount.h>

#include <asm/pgtable.h>



#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/svc.h>

#include <linux/nfsd/nfsd.h>
@@ -180,10 +181,10 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) 
		/* Check if the request originated from a secure port. */

		error = nfserr_perm;

		if (!rqstp->rq_secure && EX_SECURE(exp)) {

			char buf[RPC_MAX_ADDRBUFLEN];

			printk(KERN_WARNING

			       "nfsd: request from insecure port (%u.%u.%u.%u:%d)!\n",

			       NIPQUAD(rqstp->rq_addr.sin_addr.s_addr),

			       ntohs(rqstp->rq_addr.sin_port));

			       "nfsd: request from insecure port %s!\n",

			       svc_print_addr(rqstp, buf, sizeof(buf)));

			goto out;

		}