Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Record gss_wrap() errors in svcauth_gss_wrap_priv()

Browse Source 
Match the error reporting in the other unwrap and wrap functions.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2023-01-08 11:29:07 -05:00
parent 7b135c65bb
commit ba8b13e5f4
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/trace/events/rpcgss.h
View File

@ -206,10 +206,31 @@ DECLARE_EVENT_CLASS(rpcgss_svc_gssapi_class,
), \ ), \
TP_ARGS(rqstp, maj_stat)) TP_ARGS(rqstp, maj_stat))
DEFINE_SVC_GSSAPI_EVENT(wrap);
DEFINE_SVC_GSSAPI_EVENT(unwrap); DEFINE_SVC_GSSAPI_EVENT(unwrap);
DEFINE_SVC_GSSAPI_EVENT(mic); DEFINE_SVC_GSSAPI_EVENT(mic);
DEFINE_SVC_GSSAPI_EVENT(get_mic); DEFINE_SVC_GSSAPI_EVENT(get_mic);
TRACE_EVENT(rpcgss_svc_wrap_failed,
TP_PROTO(
const struct svc_rqst *rqstp
),
TP_ARGS(rqstp),
TP_STRUCT__entry(
__field(u32, xid)
__string(addr, rqstp->rq_xprt->xpt_remotebuf)
),
TP_fast_assign(
__entry->xid = be32_to_cpu(rqstp->rq_xid);
__assign_str(addr, rqstp->rq_xprt->xpt_remotebuf);
),
TP_printk("addr=%s xid=0x%08x", __get_str(addr), __entry->xid)
);
TRACE_EVENT(rpcgss_svc_unwrap_failed, TRACE_EVENT(rpcgss_svc_unwrap_failed,
TP_PROTO( TP_PROTO(
const struct svc_rqst *rqstp const struct svc_rqst *rqstp

29
net/sunrpc/auth_gss/svcauth_gss.c
View File

@ -1813,7 +1813,9 @@ out:
bad_mic: bad_mic:
trace_rpcgss_svc_get_mic(rqstp, maj_stat); trace_rpcgss_svc_get_mic(rqstp, maj_stat);
return -EINVAL;
wrap_failed: wrap_failed:
trace_rpcgss_svc_wrap_failed(rqstp);
return -EINVAL; return -EINVAL;
} }
@ -1834,18 +1836,16 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp)
struct gss_svc_data *gsd = rqstp->rq_auth_data; struct gss_svc_data *gsd = rqstp->rq_auth_data;
struct rpc_gss_wire_cred *gc = &gsd->clcred; struct rpc_gss_wire_cred *gc = &gsd->clcred;
struct xdr_buf *buf = &rqstp->rq_res; struct xdr_buf *buf = &rqstp->rq_res;
struct page **inpages = NULL; u32 offset, pad, maj_stat;
__be32 *p, *lenp; __be32 *p, *lenp;
int offset;
int pad;
p = svcauth_gss_prepare_to_wrap(buf, gsd); p = svcauth_gss_prepare_to_wrap(buf, gsd);
if (p == NULL) if (p == NULL)
return 0; return 0;
lenp = p++; lenp = p++;
offset = (u8 *)p - (u8 *)buf->head[0].iov_base; offset = (u8 *)p - (u8 *)buf->head[0].iov_base;
*p++ = htonl(gc->gc_seq); *p++ = htonl(gc->gc_seq);
inpages = buf->pages;
/* XXX: Would be better to write some xdr helper functions for /* XXX: Would be better to write some xdr helper functions for
* nfs{2,3,4}xdr.c that place the data right, instead of copying: */ * nfs{2,3,4}xdr.c that place the data right, instead of copying: */
@ -1859,12 +1859,12 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp)
if (buf->tail[0].iov_base) { if (buf->tail[0].iov_base) {
if (buf->tail[0].iov_base >= if (buf->tail[0].iov_base >=
buf->head[0].iov_base + PAGE_SIZE) buf->head[0].iov_base + PAGE_SIZE)
return -EINVAL; goto wrap_failed;
if (buf->tail[0].iov_base < buf->head[0].iov_base) if (buf->tail[0].iov_base < buf->head[0].iov_base)
return -EINVAL; goto wrap_failed;
if (buf->tail[0].iov_len + buf->head[0].iov_len if (buf->tail[0].iov_len + buf->head[0].iov_len
+ 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE) + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE)
return -ENOMEM; goto wrap_failed;
memmove(buf->tail[0].iov_base + RPC_MAX_AUTH_SIZE, memmove(buf->tail[0].iov_base + RPC_MAX_AUTH_SIZE,
buf->tail[0].iov_base, buf->tail[0].iov_base,
buf->tail[0].iov_len); buf->tail[0].iov_len);
@ -1879,13 +1879,16 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp)
*/ */
if (!buf->tail[0].iov_base) { if (!buf->tail[0].iov_base) {
if (buf->head[0].iov_len + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE) if (buf->head[0].iov_len + 2 * RPC_MAX_AUTH_SIZE > PAGE_SIZE)
return -ENOMEM; goto wrap_failed;
buf->tail[0].iov_base = buf->head[0].iov_base buf->tail[0].iov_base = buf->head[0].iov_base
+ buf->head[0].iov_len + RPC_MAX_AUTH_SIZE; + buf->head[0].iov_len + RPC_MAX_AUTH_SIZE;
buf->tail[0].iov_len = 0; buf->tail[0].iov_len = 0;
} }
if (gss_wrap(gsd->rsci->mechctx, offset, buf, inpages))
return -ENOMEM; maj_stat = gss_wrap(gsd->rsci->mechctx, offset, buf, buf->pages);
if (maj_stat != GSS_S_COMPLETE)
goto bad_wrap;
*lenp = htonl(buf->len - offset); *lenp = htonl(buf->len - offset);
pad = 3 - ((buf->len - offset - 1) & 3); pad = 3 - ((buf->len - offset - 1) & 3);
p = (__be32 *)(buf->tail[0].iov_base + buf->tail[0].iov_len); p = (__be32 *)(buf->tail[0].iov_base + buf->tail[0].iov_len);
@ -1894,6 +1897,12 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp)
buf->len += pad; buf->len += pad;
return 0; return 0;
wrap_failed:
trace_rpcgss_svc_wrap_failed(rqstp);
return -EINVAL;
bad_wrap:
trace_rpcgss_svc_wrap(rqstp, maj_stat);
return -ENOMEM;
} }
/** /**