Commit 24a9a961 authored Aug 03, 2015 by Jeff Layton Committed by Trond Myklebust Aug 12, 2015

sunrpc: increase UNX_MAXNODENAME from 32 to __NEW_UTS_LEN bytes

The current limit of 32 bytes artificially limits the name string that
we end up stuffing into NFSv4.x client ID blobs. If you have multiple
hosts with long hostnames that only differ near the end, then this can
cause NFSv4 client ID collisions.

Linux nodenames are actually limited to __NEW_UTS_LEN bytes (64), so use
that as the limit instead. Also, use XDR_QUADLEN to specify the slack
length, just for clarity and in case someone in the future changes this
to something not evenly divisible by 4.

Reported-by: Michael Skralivetsky <michael.skralivetsky@primarydata.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent c8ad8894

include/linux/sunrpc/auth.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -18,9 +18,13 @@
		#include <linux/atomic.h>
		#include <linux/rcupdate.h>
		#include <linux/uidgid.h>
		#include <linux/utsname.h>

		/* size of the nodename buffer */
		#define UNX_MAXNODENAME 32
		/*
		* Size of the nodename buffer. RFC1831 specifies a hard limit of 255 bytes,
		* but Linux hostnames are actually limited to __NEW_UTS_LEN bytes.
		*/
		#define UNX_MAXNODENAME __NEW_UTS_LEN

		struct rpcsec_gss_info;

net/sunrpc/auth_unix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ struct unx_cred {
		};
		#define uc_uid uc_base.cr_uid

		#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2))
		#define UNX_WRITESLACK (21 + XDR_QUADLEN(UNX_MAXNODENAME))

		#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
		# define RPCDBG_FACILITY RPCDBG_AUTH

Admin message