Patchwork [v2] slirp: Gcc 9 -O3 fix

login
register
mail settings
Submitter Dr. David Alan Gilbert
Date April 15, 2019, 12:02 p.m.
Message ID <20190415120205.2221-1-dgilbert@redhat.com>
Download mbox | patch
Permalink /patch/773025/
State New
Headers show

Comments

Dr. David Alan Gilbert - April 15, 2019, 12:02 p.m.
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Gcc 9 needs some convincing that sopreprbuf really is going to fill
in iov in the call from soreadbuf, even though the failure case
shouldn't happen.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 slirp/src/socket.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Samuel Thibault - April 15, 2019, 12:03 p.m.
Dr. David Alan Gilbert (git), le lun. 15 avril 2019 13:02:05 +0100, a ecrit:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> Gcc 9 needs some convincing that sopreprbuf really is going to fill
> in iov in the call from soreadbuf, even though the failure case
> shouldn't happen.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>  slirp/src/socket.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/slirp/src/socket.c b/slirp/src/socket.c
> index 4a3c935e25..beb8517f1c 100644
> --- a/slirp/src/socket.c
> +++ b/slirp/src/socket.c
> @@ -181,7 +181,7 @@ soread(struct socket *so)
>  	 * No need to check if there's enough room to read.
>  	 * soread wouldn't have been called if there weren't
>  	 */
> -	sopreprbuf(so, iov, &n);
> +	assert(sopreprbuf(so, iov, &n) != 0);

Please make this through a variable, otherwise anybody building with
-DNDEBUG will get sopreprbuf not being called.

>  	nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
>  	if (nn <= 0) {
> @@ -257,6 +257,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)
>  	 * No need to check if there's enough room to read.
>  	 * soread wouldn't have been called if there weren't
>  	 */
> +	assert(size > 0);
>  	if (sopreprbuf(so, iov, &n) < size)
>          goto err;
>  
> -- 
> 2.21.0
>
no-reply@patchew.org - April 15, 2019, 12:07 p.m.
Patchew URL: https://patchew.org/QEMU/20190415120205.2221-1-dgilbert@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Message-id: 20190415120205.2221-1-dgilbert@redhat.com
Subject: [Qemu-devel] [PATCH v2] slirp: Gcc 9 -O3 fix
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]               patchew/20190415120205.2221-1-dgilbert@redhat.com -> patchew/20190415120205.2221-1-dgilbert@redhat.com
Switched to a new branch 'test'
81e4d9dd83 slirp: Gcc 9 -O3 fix

=== OUTPUT BEGIN ===
ERROR: code indent should never use tabs
#23: FILE: slirp/src/socket.c:184:
+^Iassert(sopreprbuf(so, iov, &n) != 0);$

ERROR: code indent should never use tabs
#31: FILE: slirp/src/socket.c:260:
+^Iassert(size > 0);$

total: 2 errors, 0 warnings, 15 lines checked

Commit 81e4d9dd83e0 (slirp: Gcc 9 -O3 fix) has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190415120205.2221-1-dgilbert@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Dr. David Alan Gilbert - April 15, 2019, 12:15 p.m.
* Samuel Thibault (samuel.thibault@gnu.org) wrote:
> Dr. David Alan Gilbert (git), le lun. 15 avril 2019 13:02:05 +0100, a ecrit:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> > 
> > Gcc 9 needs some convincing that sopreprbuf really is going to fill
> > in iov in the call from soreadbuf, even though the failure case
> > shouldn't happen.
> > 
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > ---
> >  slirp/src/socket.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/slirp/src/socket.c b/slirp/src/socket.c
> > index 4a3c935e25..beb8517f1c 100644
> > --- a/slirp/src/socket.c
> > +++ b/slirp/src/socket.c
> > @@ -181,7 +181,7 @@ soread(struct socket *so)
> >  	 * No need to check if there's enough room to read.
> >  	 * soread wouldn't have been called if there weren't
> >  	 */
> > -	sopreprbuf(so, iov, &n);
> > +	assert(sopreprbuf(so, iov, &n) != 0);
> 
> Please make this through a variable, otherwise anybody building with
> -DNDEBUG will get sopreprbuf not being called.

Coming up.

Dave

> >  	nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
> >  	if (nn <= 0) {
> > @@ -257,6 +257,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)
> >  	 * No need to check if there's enough room to read.
> >  	 * soread wouldn't have been called if there weren't
> >  	 */
> > +	assert(size > 0);
> >  	if (sopreprbuf(so, iov, &n) < size)
> >          goto err;
> >  
> > -- 
> > 2.21.0
> > 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Patch

diff --git a/slirp/src/socket.c b/slirp/src/socket.c
index 4a3c935e25..beb8517f1c 100644
--- a/slirp/src/socket.c
+++ b/slirp/src/socket.c
@@ -181,7 +181,7 @@  soread(struct socket *so)
 	 * No need to check if there's enough room to read.
 	 * soread wouldn't have been called if there weren't
 	 */
-	sopreprbuf(so, iov, &n);
+	assert(sopreprbuf(so, iov, &n) != 0);
 
 	nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
 	if (nn <= 0) {
@@ -257,6 +257,7 @@  int soreadbuf(struct socket *so, const char *buf, int size)
 	 * No need to check if there's enough room to read.
 	 * soread wouldn't have been called if there weren't
 	 */
+	assert(size > 0);
 	if (sopreprbuf(so, iov, &n) < size)
         goto err;