diff options
| author | Chuck Lever | 2019-02-11 17:25:36 +0100 |
|---|---|---|
| committer | Anna Schumaker | 2019-02-14 17:48:36 +0100 |
| commit | 35e77d21baa04b554bf3dc9a08dfa7e569286e51 (patch) | |
| tree | d6e48672b6fbd6ce82ba47438295b18b53b2c4b0 /net/sunrpc/auth_unix.c | |
| parent | SUNRPC: Make AUTH_SYS and AUTH_NULL set au_verfsize (diff) | |
| download | kernel-qcow2-linux-35e77d21baa04b554bf3dc9a08dfa7e569286e51.tar.gz kernel-qcow2-linux-35e77d21baa04b554bf3dc9a08dfa7e569286e51.tar.xz kernel-qcow2-linux-35e77d21baa04b554bf3dc9a08dfa7e569286e51.zip | |
SUNRPC: Add rpc_auth::au_ralign field
Currently rpc_inline_rcv_pages() uses au_rslack to estimate the
size of the upper layer reply header. This is fine for auth flavors
where au_verfsize == au_rslack.
However, some auth flavors have more going on. krb5i for example has
two more words after the verifier, and another blob following the
RPC message. The calculation involving au_rslack pushes the upper
layer reply header too far into the rcv_buf.
au_rslack is still valuable: it's the amount of buffer space needed
for the reply, and is used when allocating the reply buffer. We'll
keep that.
But, add a new field that can be used to properly estimate the
location of the upper layer header in each RPC reply, based on the
auth flavor in use.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/auth_unix.c')
| -rw-r--r-- | net/sunrpc/auth_unix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c index a93c56442487..c048eb6deaaf 100644 --- a/net/sunrpc/auth_unix.c +++ b/net/sunrpc/auth_unix.c @@ -187,6 +187,7 @@ unx_validate(struct rpc_task *task, struct xdr_stream *xdr) auth->au_verfsize = XDR_QUADLEN(size) + 2; auth->au_rslack = XDR_QUADLEN(size) + 2; + auth->au_ralign = XDR_QUADLEN(size) + 2; return 0; } |