From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F07F713D8BF; Wed, 19 Jun 2024 13:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718803840; cv=none; b=EaW8m+yqcMxm2HXBZ08LwEw8noO8/fj8RN6SK3h1hmiSCUfS0pz6M9Oq7+yD7ad012kmKRC1eYfaECVlN/jMyo6WzZgIqGhjSzUWtlnp65YdQwxh4yTxJqNvVb9VIh7Z3qbzBWYXNfHDiWAumFfwGzm5swNSqJCPiaztpFj4Pow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718803840; c=relaxed/simple; bh=Q4O02rfqfeDpSm1xtE7m6er+bY413FkFv+LiP0AKFIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tqKbZt+UfSlTrs8RcORtbxsqMH3GEKy/mtpH2cEQ09zntGFZkXHcdkND4cqp5RLUT/nHjTu2TMJGRSAvUJkD1gUOtk2F7ho/T2YucTr2mfoxKzHkAaEXffi+EAAynkf3usK3QERr7AHIt3Sajo6krgKV+kqgKXprSG2uatOPV8g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GFR7A3H1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GFR7A3H1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76BC8C32786; Wed, 19 Jun 2024 13:30:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718803839; bh=Q4O02rfqfeDpSm1xtE7m6er+bY413FkFv+LiP0AKFIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFR7A3H1UxOcd8BWFyit0ZBafkwMMz6KXt3ewV/+9vEy6BUnCQka/sGM3kpGotb/Z 6Xc4IpAlIUv02Wc4QT2N7QquCLrTL0jIwhPLS8XYulPQLCdTb7kFQxkfShZO6CG7ke eFz6Fj1yKLzXHtTpySCL1VSbrw/sX4r9I6MS4FjM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen Hanxiao , Benjamin Coddington , Chuck Lever , Trond Myklebust , Sasha Levin Subject: [PATCH 6.1 121/217] SUNRPC: return proper error from gss_wrap_req_priv Date: Wed, 19 Jun 2024 14:56:04 +0200 Message-ID: <20240619125601.358178686@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125556.491243678@linuxfoundation.org> References: <20240619125556.491243678@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen Hanxiao [ Upstream commit 33c94d7e3cb84f6d130678d6d59ba475a6c489cf ] don't return 0 if snd_buf->len really greater than snd_buf->buflen Signed-off-by: Chen Hanxiao Fixes: 0c77668ddb4e ("SUNRPC: Introduce trace points in rpc_auth_gss.ko") Reviewed-by: Benjamin Coddington Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/auth_gss/auth_gss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 2d7b1e03110ae..3ef511d7af190 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -1858,8 +1858,10 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, offset = (u8 *)p - (u8 *)snd_buf->head[0].iov_base; maj_stat = gss_wrap(ctx->gc_gss_ctx, offset, snd_buf, inpages); /* slack space should prevent this ever happening: */ - if (unlikely(snd_buf->len > snd_buf->buflen)) + if (unlikely(snd_buf->len > snd_buf->buflen)) { + status = -EIO; goto wrap_failed; + } /* We're assuming that when GSS_S_CONTEXT_EXPIRED, the encryption was * done anyway, so it's safe to put the request on the wire: */ if (maj_stat == GSS_S_CONTEXT_EXPIRED) -- 2.43.0