All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] NFSD: prevent integer overflow on 32 bit systems
@ 2022-03-15 15:34 Dan Carpenter
  2022-03-15 16:22 ` Chuck Lever III
  0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2022-03-15 15:34 UTC (permalink / raw)
  To: Chuck Lever
  Cc: Anna Schumaker, Chuck Lever, linux-nfs, Trond Myklebust,
	kernel-janitors

On a 32 bit system, the "len * sizeof(*p)" operation can have an
integer overflow.

c: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: add stable to the CC.  Use SIZE_MAX.

 include/linux/sunrpc/xdr.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index b519609af1d0..4417f667c757 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -731,6 +731,8 @@ xdr_stream_decode_uint32_array(struct xdr_stream *xdr,
 
 	if (unlikely(xdr_stream_decode_u32(xdr, &len) < 0))
 		return -EBADMSG;
+	if (len > SIZE_MAX / sizeof(*p))
+		return -EBADMSG;
 	p = xdr_inline_decode(xdr, len * sizeof(*p));
 	if (unlikely(!p))
 		return -EBADMSG;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] NFSD: prevent integer overflow on 32 bit systems
  2022-03-15 15:34 [PATCH v2] NFSD: prevent integer overflow on 32 bit systems Dan Carpenter
@ 2022-03-15 16:22 ` Chuck Lever III
  2022-03-15 16:30   ` Trond Myklebust
  0 siblings, 1 reply; 4+ messages in thread
From: Chuck Lever III @ 2022-03-15 16:22 UTC (permalink / raw)
  To: Trond Myklebust
  Cc: Anna Schumaker, Dan Carpenter, Linux NFS Mailing List,
	kernel-janitors@vger.kernel.org



> On Mar 15, 2022, at 11:34 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 
> On a 32 bit system, the "len * sizeof(*p)" operation can have an
> integer overflow.
> 
> c: stable@vger.kernel.org
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Trond, this patch was To: me, but either you or I can take this.
Please let me know your preference.


> ---
> v2: add stable to the CC.  Use SIZE_MAX.
> 
> include/linux/sunrpc/xdr.h | 2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
> index b519609af1d0..4417f667c757 100644
> --- a/include/linux/sunrpc/xdr.h
> +++ b/include/linux/sunrpc/xdr.h
> @@ -731,6 +731,8 @@ xdr_stream_decode_uint32_array(struct xdr_stream *xdr,
> 
> 	if (unlikely(xdr_stream_decode_u32(xdr, &len) < 0))
> 		return -EBADMSG;
> +	if (len > SIZE_MAX / sizeof(*p))
> +		return -EBADMSG;
> 	p = xdr_inline_decode(xdr, len * sizeof(*p));
> 	if (unlikely(!p))
> 		return -EBADMSG;
> -- 
> 2.20.1
> 

--
Chuck Lever




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] NFSD: prevent integer overflow on 32 bit systems
  2022-03-15 16:22 ` Chuck Lever III
@ 2022-03-15 16:30   ` Trond Myklebust
  2022-03-15 16:39     ` Chuck Lever III
  0 siblings, 1 reply; 4+ messages in thread
From: Trond Myklebust @ 2022-03-15 16:30 UTC (permalink / raw)
  To: chuck.lever@oracle.com
  Cc: anna@kernel.org, dan.carpenter@oracle.com,
	linux-nfs@vger.kernel.org, kernel-janitors@vger.kernel.org

On Tue, 2022-03-15 at 16:22 +0000, Chuck Lever III wrote:
> 
> 
> > On Mar 15, 2022, at 11:34 AM, Dan Carpenter
> > <dan.carpenter@oracle.com> wrote:
> > 
> > On a 32 bit system, the "len * sizeof(*p)" operation can have an
> > integer overflow.
> > 
> > c: stable@vger.kernel.org
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Trond, this patch was To: me, but either you or I can take this.
> Please let me know your preference.
> 

I don't mind either way. If you've got it applied already, then let's
send it through your tree.



-- 
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] NFSD: prevent integer overflow on 32 bit systems
  2022-03-15 16:30   ` Trond Myklebust
@ 2022-03-15 16:39     ` Chuck Lever III
  0 siblings, 0 replies; 4+ messages in thread
From: Chuck Lever III @ 2022-03-15 16:39 UTC (permalink / raw)
  To: Trond Myklebust, Dan Carpenter
  Cc: anna@kernel.org, Linux NFS Mailing List,
	kernel-janitors@vger.kernel.org



> On Mar 15, 2022, at 12:30 PM, Trond Myklebust <trondmy@hammerspace.com> wrote:
> 
> On Tue, 2022-03-15 at 16:22 +0000, Chuck Lever III wrote:
>> 
>> 
>>> On Mar 15, 2022, at 11:34 AM, Dan Carpenter
>>> <dan.carpenter@oracle.com> wrote:
>>> 
>>> On a 32 bit system, the "len * sizeof(*p)" operation can have an
>>> integer overflow.
>>> 
>>> c: stable@vger.kernel.org
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> 
>> Trond, this patch was To: me, but either you or I can take this.
>> Please let me know your preference.
>> 
> 
> I don't mind either way. If you've got it applied already, then let's
> send it through your tree.

I've applied this one and "prevent underflow in nfssvc_decode_writeargs".
Thanks, Trond and Dan!


--
Chuck Lever




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-03-15 16:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-15 15:34 [PATCH v2] NFSD: prevent integer overflow on 32 bit systems Dan Carpenter
2022-03-15 16:22 ` Chuck Lever III
2022-03-15 16:30   ` Trond Myklebust
2022-03-15 16:39     ` Chuck Lever III

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.