From: Alex Dewar <alex.dewar90@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Alex Dewar <alex.dewar90@gmail.com>,
Chuck Lever <chuck.lever@oracle.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Artur Molchanov <arturmolchanov@gmail.com>,
linux-nfs@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net/sunrpc: Fix return value from proc_do_xprt()
Date: Sat, 7 Nov 2020 13:49:40 +0000 [thread overview]
Message-ID: <20201107134940.c2hmfpcx743bqc5o@medion> (raw)
In-Reply-To: <20201106220721.GE26028@fieldses.org>
On Fri, Nov 06, 2020 at 05:07:21PM -0500, J. Bruce Fields wrote:
> Whoops, got 3 independent patches for this and overlooked this one. See
> https://lore.kernel.org/linux-nfs/20201106205959.GB26028@fieldses.org/T/#t
>
> --b.
That looks like a cleaner fix. Thanks for looking anyhow and sorry for
the noise!
>
> On Sat, Oct 24, 2020 at 03:52:40PM +0100, Alex Dewar wrote:
> > Commit c09f56b8f68d ("net/sunrpc: Fix return value for sysctl
> > sunrpc.transports") attempted to add error checking for the call to
> > memory_read_from_buffer(), however its return value was assigned to a
> > size_t variable, so any negative values would be lost in the cast. Fix
> > this.
> >
> > Addresses-Coverity-ID: 1498033: Control flow issues (NO_EFFECT)
> > Fixes: c09f56b8f68d ("net/sunrpc: Fix return value for sysctl sunrpc.transports")
> > Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
> > ---
> > net/sunrpc/sysctl.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
> > index a18b36b5422d..c95a2b84dd95 100644
> > --- a/net/sunrpc/sysctl.c
> > +++ b/net/sunrpc/sysctl.c
> > @@ -62,6 +62,7 @@ rpc_unregister_sysctl(void)
> > static int proc_do_xprt(struct ctl_table *table, int write,
> > void *buffer, size_t *lenp, loff_t *ppos)
> > {
> > + ssize_t bytes_read;
> > char tmpbuf[256];
> > size_t len;
> >
> > @@ -70,12 +71,14 @@ static int proc_do_xprt(struct ctl_table *table, int write,
> > return 0;
> > }
> > len = svc_print_xprts(tmpbuf, sizeof(tmpbuf));
> > - *lenp = memory_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
> > + bytes_read = memory_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len);
> >
> > - if (*lenp < 0) {
> > + if (bytes_read < 0) {
> > *lenp = 0;
> > return -EINVAL;
> > }
> > +
> > + *lenp = bytes_read;
> > return 0;
> > }
> >
> > --
> > 2.29.1
next prev parent reply other threads:[~2020-11-07 13:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-24 14:52 [PATCH] net/sunrpc: Fix return value from proc_do_xprt() Alex Dewar
2020-11-06 22:07 ` J. Bruce Fields
2020-11-07 13:49 ` Alex Dewar [this message]
2020-11-07 15:39 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201107134940.c2hmfpcx743bqc5o@medion \
--to=alex.dewar90@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=arturmolchanov@gmail.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).