Fix gss_unwrap_resp_integ() again
Subsystems (3)
v2 cover Fix gss_unwrap_resp_integ() again
Changes since v1:
- Reviewed-by: Ben Coddington <[email protected]>
- Revised patch description of PATCH 1/3
- Split out stack diet change into a separate patch
Turns out the gss routines are pretty hefty stack users. More work needs to be done throughout. PATCH 3/3 is kind of a down payment.
---
Chuck Lever (3):
sunrpc: Fix gss_unwrap_resp_integ() again
SUNRPC: Remove xdr_buf_read_mic()
SUNRPC: Trim stack utilization in the wrap and unwrap paths
include/linux/sunrpc/xdr.h | 1 net/sunrpc/auth_gss/auth_gss.c | 93 +++++++++++++++++++++++++++++----------- net/sunrpc/xdr.c | 55 ------------------------ 3 files changed, 68 insertions(+), 81 deletions(-)
--
Chuck Lever
PATCH v2 1/3 sunrpc: Fix gss_unwrap_resp_integ() again
xdr_buf_read_mic() tries to find unused contiguous space in a received xdr_buf in order to linearize the checksum for the call to gss_verify_mic. However, the corner cases in this code are numerous and we seem to keep missing them. I've just hit yet another buffer overrun related to it.
This overrun is at the end of xdr_buf_read_mic():
1284 if (buf->tail[0].iov_len != 0)
1285 mic->data = buf->tail[0].iov_base + buf->tail[0].iov_len;
1286 else
1287 mic->data = buf->head[0].iov_base + buf->head[0].iov_len;
1288 __read_bytes_from_xdr_buf(&subbuf, mic->data, mic->len);
1289 return 0;
This logic assumes the transport has set the length of the tail based on the size of the received message. base + len is then supposed to be off the end of the message but still within the actual buffer.
In fact, the length of the tail is set by the upper layer when the Call is encoded so that the end of the tail is actually the end of the allocated buffer itself. This causes the logic above to set mic->data to point past the end of the receive buffer.
The "mic->data = head" arm of this if statement is no less fragile.
As near as I can tell, this has been a problem forever. I'm not sure that minimizing au_rslack recently changed this pathology much.
So instead, let's use a more straightforward approach: kmalloc a separate buffer to linearize the checksum. This is similar to how gss_validate() currently works.
Coming back to this code, I had some trouble understanding what was going on. So I've cleaned up the variable naming and added a few comments that point back to the XDR definition in RFC 2203 to help guide future spelunkers, including myself.
As an added clean up, the functionality that was in xdr_buf_read_mic() is folded directly into gss_unwrap_resp_integ(), as that is its only caller.
--- net/sunrpc/auth_gss/auth_gss.c | 79 ++++++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 19 deletions(-)
net/sunrpc/auth_gss/auth_gss.c +60 -19
@@ -1934,35 +1934,71 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr)return 0 ; } +/* +* RFC 2203, Section 5.3.2.2 +* +* struct rpc_gss_integ_data { +* opaque databody_integ<>; +* opaque checksum<>; +* }; +* +* struct rpc_gss_data_t { +* unsigned int seq_num; +* proc_req_arg_t arg; +* }; +*/ static int gss_unwrap_resp_integ (struct rpc_task *task,struct rpc_cred *cred,struct gss_cl_ctx *ctx,struct rpc_rqst *rqstp,struct xdr_stream *xdr) { -struct xdr_buf integ_buf, *rcv_buf = &rqstp->rq_rcv_buf; -u32 data_offset, mic_offset, integ_len, maj_stat; +struct xdr_buf gss_data, *rcv_buf = &rqstp->rq_rcv_buf;struct rpc_auth *auth = cred->cr_auth; +u32 len, offset, seqno, maj_stat;struct xdr_netobj mic; -__be32 *p; +int ret; - p =xdr_inline_decode (xdr,2 *sizeof (*p)); -if (unlikely (!p)) + ret = -EIO ; + mic.data =NULL ; + +/* opaque databody_integ<>; */ +if (xdr_stream_decode_u32 (xdr, &len)) goto unwrap_failed; - integ_len =be32_to_cpup (p++); -if (integ_len &3 ) +if (len &3 ) goto unwrap_failed; - data_offset = (u8 *)(p) - (u8 *)rcv_buf->head[0 ].iov_base; - mic_offset = integ_len + data_offset; -if (mic_offset > rcv_buf->len) + offset = rcv_buf->len -xdr_stream_remaining (xdr); +if (xdr_stream_decode_u32 (xdr, &seqno)) goto unwrap_failed; -if (be32_to_cpup (p) != rqstp->rq_seqno) +if (seqno != rqstp->rq_seqno) goto bad_seqno; +if (xdr_buf_subsegment (rcv_buf, &gss_data, offset, len)) + goto unwrap_failed; -if (xdr_buf_subsegment (rcv_buf, &integ_buf, data_offset, integ_len)) +/* +* The xdr_stream now points to the beginning of the +* upper layer payload, to be passed below to +* rpcauth_unwrap_resp_decode(). The checksum, which +* follows the upper layer payload in @rcv_buf, is +* located and parsed without updating the xdr_stream. +*/ + +/* opaque checksum<>; */ + offset += len; +if (xdr_decode_word (rcv_buf, offset, &len)) + goto unwrap_failed; + offset +=sizeof (__be32); +if (len >GSS_VERF_SLACK <<2 ) goto unwrap_failed; -if (xdr_buf_read_mic (rcv_buf, &mic, mic_offset)) +if (offset + len > rcv_buf->len) goto unwrap_failed; - maj_stat =gss_verify_mic (ctx->gc_gss_ctx, &integ_buf, &mic); + mic.len = len; + mic.data =kmalloc (len,GFP_NOFS ); +if (!mic.data) + goto unwrap_failed; +if (read_bytes_from_xdr_buf (rcv_buf, offset, mic.data, mic.len)) + goto unwrap_failed; + + maj_stat =gss_verify_mic (ctx->gc_gss_ctx, &gss_data, &mic);if (maj_stat ==GSS_S_CONTEXT_EXPIRED )clear_bit (RPCAUTH_CRED_UPTODATE , &cred->cr_flags);if (maj_stat !=GSS_S_COMPLETE )
@@ -1970,16 +2006,21 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr) auth->au_rslack = auth->au_verfsize +2 +1 +XDR_QUADLEN (mic.len); auth->au_ralign = auth->au_verfsize +2 ; -return 0 ; + ret =0 ; + +out: +kfree (mic.data); +return ret; + unwrap_failed:trace_rpcgss_unwrap_failed (task); -return -EIO ; + goto out; bad_seqno: -trace_rpcgss_bad_seqno (task, rqstp->rq_seqno,be32_to_cpup (p)); -return -EIO ; +trace_rpcgss_bad_seqno (task, rqstp->rq_seqno, seqno); + goto out; bad_mic:trace_rpcgss_verify_mic (task, maj_stat); -return -EIO ; + goto out; } static int
Re: [PATCH v2 1/3] sunrpc: Fix gss_unwrap_resp_integ() again
Quoted 127 lines · Chuck Lever
xdr_buf_read_mic()tries to find unused contiguous space in a receivedxdr_bufin order to linearize the checksum for the call togss_verify_mic. However, the corner cases in this code are numerous and we seem to keep missing them. I've just hit yet another buffer overrun related to it.This overrun is at the end of
xdr_buf_read_mic():1284 if (buf->tail[0].iov_len != 0)
1285mic->data= buf->tail[0].iov_base + buf->tail[0].iov_len;
1286 else
1287mic->data= buf->head[0].iov_base + buf->head[0].iov_len;
1288__read_bytes_from_xdr_buf(&subbuf, mic->data, mic->len);
1289 return 0;This logic assumes the transport has set the length of the tail based on the size of the received message. base + len is then supposed to be off the end of the message but still within the actual buffer.
In fact, the length of the tail is set by the upper layer when the Call is encoded so that the end of the tail is actually the end of the allocated buffer itself. This causes the logic above to set
mic->datato point past the end of the receive buffer.The "
mic->data= head" arm of this if statement is no less fragile.As near as I can tell, this has been a problem forever. I'm not sure that minimizing
au_rslackrecently changed this pathology much.So instead, let's use a more straightforward approach: kmalloc a separate buffer to linearize the checksum. This is similar to how
gss_validate()currently works.Coming back to this code, I had some trouble understanding what was going on. So I've cleaned up the variable naming and added a few comments that point back to the XDR definition in RFC 2203 to help guide future spelunkers, including myself.
As an added clean up, the functionality that was in
xdr_buf_read_mic()is folded directly intogss_unwrap_resp_integ(), as that is its only caller.Signed-off-by Chuck Lever <[email protected]>Reviewed-by Benjamin Coddington <[email protected]>---
net/sunrpc/auth_gss/auth_gss.c| 79 ++++++++++++++++++++++++++++++----------1 file changed, 60 insertions(+), 19 deletions(-)net/sunrpc/auth_gss/auth_gss.c +13
-0@@ -1934,35 +1934,71 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr)return 0 ; } +/* +* RFC 2203, Section 5.3.2.2 +* +* struct rpc_gss_integ_data { +* opaque databody_integ<>; +* opaque checksum<>; +* }; +* +* struct rpc_gss_data_t { +* unsigned int seq_num; +* proc_req_arg_t arg; +* }; +*/ static int
gss_unwrap_resp_integ(structrpc_task*task, structrpc_cred*cred,
structgss_cl_ctx*ctx, structrpc_rqst*rqstp, structxdr_stream*xdr)
{net/sunrpc/auth_gss/auth_gss.c +1
-2-struct xdr_buf integ_buf, *rcv_buf = &rqstp->rq_rcv_buf; -u32 data_offset, mic_offset, integ_len, maj_stat; +struct xdr_buf gss_data, *rcv_buf = &rqstp->rq_rcv_buf;struct rpc_auth *auth = cred->cr_auth;net/sunrpc/auth_gss/auth_gss.c +1
-0+u32 len, offset, seqno, maj_stat;struct xdr_netobj mic;net/sunrpc/auth_gss/auth_gss.c +6
-3-__be32 *p; +int ret; - p =xdr_inline_decode (xdr,2 *sizeof (*p)); -if (unlikely (!p)) + ret = -EIO ; + mic.data =NULL ; + +/* opaque databody_integ<>; */ +if (xdr_stream_decode_u32 (xdr, &len))goto unwrap_failed;net/sunrpc/auth_gss/auth_gss.c +1
-2- integ_len =be32_to_cpup (p++); -if (integ_len &3 ) +if (len &3 )goto unwrap_failed;net/sunrpc/auth_gss/auth_gss.c +2
-3- data_offset = (u8 *)(p) - (u8 *)rcv_buf->head[0 ].iov_base; - mic_offset = integ_len + data_offset; -if (mic_offset > rcv_buf->len) + offset = rcv_buf->len -xdr_stream_remaining (xdr); +if (xdr_stream_decode_u32 (xdr, &seqno))goto unwrap_failed;net/sunrpc/auth_gss/auth_gss.c +1
-1-if (be32_to_cpup (p) != rqstp->rq_seqno) +if (seqno != rqstp->rq_seqno)goto bad_seqno;net/sunrpc/auth_gss/auth_gss.c +16
-1+if (xdr_buf_subsegment (rcv_buf, &gss_data, offset, len)) + goto unwrap_failed; -if (xdr_buf_subsegment (rcv_buf, &integ_buf, data_offset, integ_len)) +/* +* The xdr_stream now points to the beginning of the +* upper layer payload, to be passed below to +* rpcauth_unwrap_resp_decode(). The checksum, which +* follows the upper layer payload in @rcv_buf, is +* located and parsed without updating the xdr_stream. +*/ + +/* opaque checksum<>; */ + offset += len; +if (xdr_decode_word (rcv_buf, offset, &len)) + goto unwrap_failed; + offset +=sizeof (__be32); +if (len >GSS_VERF_SLACK <<2 )
Quoted 1 line
goto unwrap_failed;
Based on the conversation in the other thread about NFSv3 + krb5p, this would appear to be an arbitrary and over-aggressive sanity check.
I'll post a v3 of this series with this check removed.
Quoted 41 lines
net/sunrpc/auth_gss/auth_gss.c +1
-1-if (xdr_buf_read_mic (rcv_buf, &mic, mic_offset)) +if (offset + len > rcv_buf->len)goto unwrap_failed;net/sunrpc/auth_gss/auth_gss.c +8
-1- maj_stat =gss_verify_mic (ctx->gc_gss_ctx, &integ_buf, &mic); + mic.len = len; + mic.data =kmalloc (len,GFP_NOFS ); +if (!mic.data) + goto unwrap_failed; +if (read_bytes_from_xdr_buf (rcv_buf, offset, mic.data, mic.len)) + goto unwrap_failed; + + maj_stat =gss_verify_mic (ctx->gc_gss_ctx, &gss_data, &mic);if (maj_stat == GSS_S_CONTEXT_EXPIRED) clear_bit(RPCAUTH_CRED_UPTODATE, &cred->cr_flags); if (maj_stat != GSS_S_COMPLETE)net/sunrpc/auth_gss/auth_gss.c +6
-1@@ -1970,16 +2006,21 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr) auth->au_rslack = auth->au_verfsize +2 +1 +XDR_QUADLEN (mic.len); auth->au_ralign = auth->au_verfsize +2 ; -return 0 ; + ret =0 ; + +out: +kfree (mic.data); +return ret; +
unwrap_failed:trace_rpcgss_unwrap_failed(task);net/sunrpc/auth_gss/auth_gss.c +1
-1-return -EIO ; + goto out;
bad_seqno:net/sunrpc/auth_gss/auth_gss.c +2
-2-trace_rpcgss_bad_seqno (task, rqstp->rq_seqno,be32_to_cpup (p)); -return -EIO ; +trace_rpcgss_bad_seqno (task, rqstp->rq_seqno, seqno); + goto out;
bad_mic:trace_rpcgss_verify_mic(task, maj_stat);net/sunrpc/auth_gss/auth_gss.c +1
-1-return -EIO ; + goto out;}
Quoted 2 lines
static int
--
Chuck Lever
PATCH v2 2/3 SUNRPC: Remove xdr_buf_read_mic()
In reply to Chuck LeverClean up: this function is no longer used.
--- include/linux/sunrpc/xdr.h | 1 - net/sunrpc/xdr.c | 55 -------------------------------------------- 2 files changed, 56 deletions(-)
include/linux/sunrpc/xdr.h +0 -1
@@ -184,7 +184,6 @@ static inline void xdr_netobj_dup(struct xdr_netobj *dst,extern void xdr_shift_buf (struct xdr_buf *,size_t );extern void xdr_buf_from_iov (struct kvec *,struct xdr_buf *);extern int xdr_buf_subsegment (struct xdr_buf *,struct xdr_buf *,unsigned int ,unsigned int ); -extern int xdr_buf_read_mic (struct xdr_buf *,struct xdr_netobj *,unsigned int );extern int read_bytes_from_xdr_buf (struct xdr_buf *,unsigned int ,void *,unsigned int );extern int write_bytes_to_xdr_buf (struct xdr_buf *,unsigned int ,void *,unsigned int );
net/sunrpc/xdr.c +0 -55
61 lines not on this page · raw message
PATCH v2 3/3 SUNRPC: Trim stack utilization in the wrap and unwrap paths
In reply to Chuck LeverBy preventing compiler inlining of the integrity and privacy helpers, stack utilization for the common case (authentication only) goes way down.
--- net/sunrpc/auth_gss/auth_gss.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
net/sunrpc/auth_gss/auth_gss.c +8 -6
@@ -1724,8 +1724,9 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred) goto out; } -static int gss_wrap_req_integ (struct rpc_cred *cred,struct gss_cl_ctx *ctx, -struct rpc_task *task,struct xdr_stream *xdr) +static noinline_for_stack int +gss_wrap_req_integ (struct rpc_cred *cred,struct gss_cl_ctx *ctx, +struct rpc_task *task,struct xdr_stream *xdr) {struct rpc_rqst *rqstp = task->tk_rqstp;struct xdr_buf integ_buf, *snd_buf = &rqstp->rq_snd_buf;
@@ -1816,8 +1817,9 @@ static int gss_wrap_req_integ(struct rpc_cred *cred, struct gss_cl_ctx *ctx,return -EAGAIN ; } -static int gss_wrap_req_priv (struct rpc_cred *cred,struct gss_cl_ctx *ctx, -struct rpc_task *task,struct xdr_stream *xdr) +static noinline_for_stack int +gss_wrap_req_priv (struct rpc_cred *cred,struct gss_cl_ctx *ctx, +struct rpc_task *task,struct xdr_stream *xdr) {struct rpc_rqst *rqstp = task->tk_rqstp;struct xdr_buf *snd_buf = &rqstp->rq_snd_buf;
@@ -1947,7 +1949,7 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr)* proc_req_arg_t arg; * }; */ -static int +static noinline_for_stack intgss_unwrap_resp_integ (struct rpc_task *task,struct rpc_cred *cred,struct gss_cl_ctx *ctx,struct rpc_rqst *rqstp,struct xdr_stream *xdr)
@@ -2023,7 +2025,7 @@ static int gss_wrap_req(struct rpc_task *task, struct xdr_stream *xdr) goto out; } -static int +static noinline_for_stack intgss_unwrap_resp_priv (struct rpc_task *task,struct rpc_cred *cred,struct gss_cl_ctx *ctx,struct rpc_rqst *rqstp,struct xdr_stream *xdr)