[LTP] [PATCH] rpc01: fix variable not initialized

[LTP] [PATCH] rpc01: fix variable not initialized

[Hongchen Zhang]

when error occurred in function callrpc/clnt_call, return_buffer may
be leaved not initialized.So initialize return_buffer to NULL,and
retrieve the return_buffer->data when return_buffer is really assigned.

Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
---
 testcases/network/rpc/basic_tests/rpc01/rpc1.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
index bc9f35b..5691c06 100644
--- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
+++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
@@ -24,7 +24,7 @@ void usage_error(char *program_name);
 int main(int argc, char *argv[])
 {
 	struct hostent *hp;
-	struct data buffer, *return_buffer;
+	struct data buffer, *return_buffer = NULL;
 	int i, n, rc;
 	FILE *fp;
 	struct stat stat_buffer;
@@ -128,7 +128,8 @@ int main(int argc, char *argv[])
 	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
 			(char *)&buffer, (xdrproc_t)xdr_receive_data,
 			(char *)&return_buffer);
-	do_compare(rc, "callrpc", &buffer, return_buffer->data);
+	do_compare(rc, "callrpc", &buffer,
+				return_buffer ? return_buffer->data : NULL);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -145,7 +146,8 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "udp transport", &buffer, return_buffer->data);
+	do_compare(rc, "udp transport", &buffer,
+				return_buffer ? return_buffer->data : NULL);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -160,7 +162,8 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
+	do_compare(rc, "tcp transport", &buffer,
+				return_buffer ? return_buffer->data : NULL);
 
 	exit(0);
 }
-- 
1.8.3.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] rpc01: fix variable not initialized

[Petr Vorel]

Hi all,

[ Cc Steve and libtirpc-devel ML ]

> when error occurred in function callrpc/clnt_call, return_buffer may
> be leaved not initialized.So initialize return_buffer to NULL,and
> retrieve the return_buffer->data when return_buffer is really assigned.

Shouldn't be rc used for verification?

man callrpc(3):
int callrpc(...);
...
This routine returns zero if it succeeds, or the value of enum clnt_stat cast to
an integer if it fails. The routine clnt_perrno() is handy for translating
failure statuses into messages.

Kind regards,
Petr

> Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
> ---
>  testcases/network/rpc/basic_tests/rpc01/rpc1.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)

> diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> index bc9f35b..5691c06 100644
> --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> @@ -24,7 +24,7 @@ void usage_error(char *program_name);
>  int main(int argc, char *argv[])
>  {
>  	struct hostent *hp;
> -	struct data buffer, *return_buffer;
> +	struct data buffer, *return_buffer = NULL;
>  	int i, n, rc;
>  	FILE *fp;
>  	struct stat stat_buffer;
> @@ -128,7 +128,8 @@ int main(int argc, char *argv[])
>  	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
>  			(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  			(char *)&return_buffer);
> -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
> +	do_compare(rc, "callrpc", &buffer,
> +				return_buffer ? return_buffer->data : NULL);

>  	server_sin.sin_port = 0;
>  	sock = RPC_ANYSOCK;
> @@ -145,7 +146,8 @@ int main(int argc, char *argv[])
>  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  				(char *)&return_buffer, timeout);
>  	clnt_destroy(clnt);
> -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
> +	do_compare(rc, "udp transport", &buffer,
> +				return_buffer ? return_buffer->data : NULL);

>  	server_sin.sin_port = 0;
>  	sock = RPC_ANYSOCK;
> @@ -160,7 +162,8 @@ int main(int argc, char *argv[])
>  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  				(char *)&return_buffer, timeout);
>  	clnt_destroy(clnt);
> -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
> +	do_compare(rc, "tcp transport", &buffer,
> +				return_buffer ? return_buffer->data : NULL);

>  	exit(0);
>  }

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH v2] rpc01: fix variable not initialized

[Hongchen Zhang]

when error occurred in function callrpc/clnt_call, return_buffer may
be leaved not initialized.
As Petr said, we should check the return value before retrieve the
return_buffer->data. Change do_compare's parameter from char * to
struct data * to fix it.

Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
---
 testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
index bc9f35b..6b8619d 100644
--- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
+++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
@@ -18,7 +18,8 @@ char *file_name = NULL;
 char host_name[100];
 long host_address;
 
-void do_compare(int, char *, struct data *, char *);
+void do_compare(int rpc_rc, char *msg, struct data *buffer,
+			struct data *ret_buffer)
 void usage_error(char *program_name);
 
 int main(int argc, char *argv[])
@@ -128,7 +129,7 @@ int main(int argc, char *argv[])
 	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
 			(char *)&buffer, (xdrproc_t)xdr_receive_data,
 			(char *)&return_buffer);
-	do_compare(rc, "callrpc", &buffer, return_buffer->data);
+	do_compare(rc, "callrpc", &buffer, return_buffer);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -145,7 +146,7 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "udp transport", &buffer, return_buffer->data);
+	do_compare(rc, "udp transport", &buffer, return_buffer);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -160,12 +161,13 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
+	do_compare(rc, "tcp transport", &buffer, return_buffer);
 
 	exit(0);
 }
 
-void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
+void do_compare(int rpc_rc, char *msg, struct data *buffer,
+			struct data *ret_buffer)
 {
 	int rc;
 
@@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
 		printf("\n");
 		exit(1);
 	}
-	rc = memcmp(buffer->data, ret_data, buffer->data_length);
+	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
 	if (rc) {
 		printf("Data compare for %s returned %d\n", msg, rc);
 		exit(1);
-- 
1.8.3.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2] rpc01: fix variable not initialized

[Richard Palethorpe]

Hello,

Looks OK to me, Petr?

Acked-by: Richard Palethorpe <rpalethorpe@suse.com>

Hongchen Zhang <zhanghongchen@loongson.cn> writes:

> when error occurred in function callrpc/clnt_call, return_buffer may
> be leaved not initialized.
> As Petr said, we should check the return value before retrieve the
> return_buffer->data. Change do_compare's parameter from char * to
> struct data * to fix it.
>
> Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
> ---
>  testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> index bc9f35b..6b8619d 100644
> --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> @@ -18,7 +18,8 @@ char *file_name = NULL;
>  char host_name[100];
>  long host_address;
>  
> -void do_compare(int, char *, struct data *, char *);
> +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> +			struct data *ret_buffer)
>  void usage_error(char *program_name);
>  
>  int main(int argc, char *argv[])
> @@ -128,7 +129,7 @@ int main(int argc, char *argv[])
>  	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
>  			(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  			(char *)&return_buffer);
> -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
> +	do_compare(rc, "callrpc", &buffer, return_buffer);
>  
>  	server_sin.sin_port = 0;
>  	sock = RPC_ANYSOCK;
> @@ -145,7 +146,7 @@ int main(int argc, char *argv[])
>  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  				(char *)&return_buffer, timeout);
>  	clnt_destroy(clnt);
> -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
> +	do_compare(rc, "udp transport", &buffer, return_buffer);
>  
>  	server_sin.sin_port = 0;
>  	sock = RPC_ANYSOCK;
> @@ -160,12 +161,13 @@ int main(int argc, char *argv[])
>  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>  				(char *)&return_buffer, timeout);
>  	clnt_destroy(clnt);
> -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
> +	do_compare(rc, "tcp transport", &buffer, return_buffer);
>  
>  	exit(0);
>  }
>  
> -void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
> +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> +			struct data *ret_buffer)
>  {
>  	int rc;
>  
> @@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
>  		printf("\n");
>  		exit(1);
>  	}
> -	rc = memcmp(buffer->data, ret_data, buffer->data_length);
> +	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
>  	if (rc) {
>  		printf("Data compare for %s returned %d\n", msg, rc);
>  		exit(1);
> -- 
> 1.8.3.1


-- 
Thank you,
Richard.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2] rpc01: fix variable not initialized

[Petr Vorel]

Hi Richie,


> Hello,

> Looks OK to me, Petr?

> Acked-by: Richard Palethorpe <rpalethorpe@suse.com>

I replied at ML at v1 [1] with a question to use rc for verification.
I'm not sure whether it was me who marked the question as superseded.

@Hongchen you sent v1 twice, v2 twice. Duplicate send without your reply does
not speedup things. Please next time reply with ping (but if you don't reply to
the question, ball is on your side).

Kind regards,
Petr

[1] https://lore.kernel.org/ltp/Ysu+mbkO8eUP4A2+@pevik/
[2] https://patchwork.ozlabs.org/project/ltp/list/?submitter=84160&state=*

> Hongchen Zhang <zhanghongchen@loongson.cn> writes:

> > when error occurred in function callrpc/clnt_call, return_buffer may
> > be leaved not initialized.
> > As Petr said, we should check the return value before retrieve the
> > return_buffer->data. Change do_compare's parameter from char * to
> > struct data * to fix it.

> > Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
> > ---
> >  testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
> >  1 file changed, 8 insertions(+), 6 deletions(-)

> > diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> > index bc9f35b..6b8619d 100644
> > --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> > +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> > @@ -18,7 +18,8 @@ char *file_name = NULL;
> >  char host_name[100];
> >  long host_address;

> > -void do_compare(int, char *, struct data *, char *);
> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> > +			struct data *ret_buffer)
> >  void usage_error(char *program_name);

> >  int main(int argc, char *argv[])
> > @@ -128,7 +129,7 @@ int main(int argc, char *argv[])
> >  	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
> >  			(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >  			(char *)&return_buffer);
> > -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
> > +	do_compare(rc, "callrpc", &buffer, return_buffer);

> >  	server_sin.sin_port = 0;
> >  	sock = RPC_ANYSOCK;
> > @@ -145,7 +146,7 @@ int main(int argc, char *argv[])
> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >  				(char *)&return_buffer, timeout);
> >  	clnt_destroy(clnt);
> > -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
> > +	do_compare(rc, "udp transport", &buffer, return_buffer);

> >  	server_sin.sin_port = 0;
> >  	sock = RPC_ANYSOCK;
> > @@ -160,12 +161,13 @@ int main(int argc, char *argv[])
> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >  				(char *)&return_buffer, timeout);
> >  	clnt_destroy(clnt);
> > -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
> > +	do_compare(rc, "tcp transport", &buffer, return_buffer);

> >  	exit(0);
> >  }

> > -void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> > +			struct data *ret_buffer)
> >  {
> >  	int rc;

> > @@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
> >  		printf("\n");
> >  		exit(1);
> >  	}
> > -	rc = memcmp(buffer->data, ret_data, buffer->data_length);
> > +	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
> >  	if (rc) {
> >  		printf("Data compare for %s returned %d\n", msg, rc);
> >  		exit(1);
> > -- 
> > 1.8.3.1

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2] rpc01: fix variable not initialized

[Richard Palethorpe]

Hello,

Petr Vorel <pvorel@suse.cz> writes:

> Hi Richie,
>
>
>> Hello,
>
>> Looks OK to me, Petr?
>
>> Acked-by: Richard Palethorpe <rpalethorpe@suse.com>
>
> I replied at ML at v1 [1] with a question to use rc for verification.
> I'm not sure whether it was me who marked the question as superseded.

Probably me.

>
> @Hongchen you sent v1 twice, v2 twice. Duplicate send without your reply does
> not speedup things. Please next time reply with ping (but if you don't reply to
> the question, ball is on your side).

I'll mark this as changes requested.

TBH I think the test needs rewriting in the new API in pure C. So this
is likely to be wasted effort.

>
> Kind regards,
> Petr
>
> [1] https://lore.kernel.org/ltp/Ysu+mbkO8eUP4A2+@pevik/
> [2] https://patchwork.ozlabs.org/project/ltp/list/?submitter=84160&state=*
>
>> Hongchen Zhang <zhanghongchen@loongson.cn> writes:
>
>> > when error occurred in function callrpc/clnt_call, return_buffer may
>> > be leaved not initialized.
>> > As Petr said, we should check the return value before retrieve the
>> > return_buffer->data. Change do_compare's parameter from char * to
>> > struct data * to fix it.
>
>> > Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
>> > ---
>> >  testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
>> >  1 file changed, 8 insertions(+), 6 deletions(-)
>
>> > diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> > index bc9f35b..6b8619d 100644
>> > --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> > +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> > @@ -18,7 +18,8 @@ char *file_name = NULL;
>> >  char host_name[100];
>> >  long host_address;
>
>> > -void do_compare(int, char *, struct data *, char *);
>> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
>> > +			struct data *ret_buffer)
>> >  void usage_error(char *program_name);
>
>> >  int main(int argc, char *argv[])
>> > @@ -128,7 +129,7 @@ int main(int argc, char *argv[])
>> >  	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
>> >  			(char *)&buffer, (xdrproc_t)xdr_receive_data,
>> >  			(char *)&return_buffer);
>> > -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
>> > +	do_compare(rc, "callrpc", &buffer, return_buffer);
>
>> >  	server_sin.sin_port = 0;
>> >  	sock = RPC_ANYSOCK;
>> > @@ -145,7 +146,7 @@ int main(int argc, char *argv[])
>> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>> >  				(char *)&return_buffer, timeout);
>> >  	clnt_destroy(clnt);
>> > -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
>> > +	do_compare(rc, "udp transport", &buffer, return_buffer);
>
>> >  	server_sin.sin_port = 0;
>> >  	sock = RPC_ANYSOCK;
>> > @@ -160,12 +161,13 @@ int main(int argc, char *argv[])
>> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>> >  				(char *)&return_buffer, timeout);
>> >  	clnt_destroy(clnt);
>> > -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
>> > +	do_compare(rc, "tcp transport", &buffer, return_buffer);
>
>> >  	exit(0);
>> >  }
>
>> > -void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
>> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
>> > +			struct data *ret_buffer)
>> >  {
>> >  	int rc;
>
>> > @@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
>> >  		printf("\n");
>> >  		exit(1);
>> >  	}
>> > -	rc = memcmp(buffer->data, ret_data, buffer->data_length);
>> > +	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
>> >  	if (rc) {
>> >  		printf("Data compare for %s returned %d\n", msg, rc);
>> >  		exit(1);
>> > -- 
>> > 1.8.3.1


-- 
Thank you,
Richard.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2] rpc01: fix variable not initialized

[Petr Vorel]

> Hello,

> Petr Vorel <pvorel@suse.cz> writes:

> > Hi Richie,


> >> Hello,

> >> Looks OK to me, Petr?

> >> Acked-by: Richard Palethorpe <rpalethorpe@suse.com>

> > I replied at ML at v1 [1] with a question to use rc for verification.
> > I'm not sure whether it was me who marked the question as superseded.

> Probably me.


> > @Hongchen you sent v1 twice, v2 twice. Duplicate send without your reply does
> > not speedup things. Please next time reply with ping (but if you don't reply to
> > the question, ball is on your side).

> I'll mark this as changes requested.

> TBH I think the test needs rewriting in the new API in pure C. So this
> is likely to be wasted effort.

+1

@Hongchen are you trying to fix actual problem or just some static analyzer
suggested that variable can be uninitialized?

Kind regards,
Petr

> > Kind regards,
> > Petr

> > [1] https://lore.kernel.org/ltp/Ysu+mbkO8eUP4A2+@pevik/
> > [2] https://patchwork.ozlabs.org/project/ltp/list/?submitter=84160&state=*

> >> Hongchen Zhang <zhanghongchen@loongson.cn> writes:

> >> > when error occurred in function callrpc/clnt_call, return_buffer may
> >> > be leaved not initialized.
> >> > As Petr said, we should check the return value before retrieve the
> >> > return_buffer->data. Change do_compare's parameter from char * to
> >> > struct data * to fix it.

> >> > Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
> >> > ---
> >> >  testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
> >> >  1 file changed, 8 insertions(+), 6 deletions(-)

> >> > diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> >> > index bc9f35b..6b8619d 100644
> >> > --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> >> > +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
> >> > @@ -18,7 +18,8 @@ char *file_name = NULL;
> >> >  char host_name[100];
> >> >  long host_address;

> >> > -void do_compare(int, char *, struct data *, char *);
> >> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> >> > +			struct data *ret_buffer)
> >> >  void usage_error(char *program_name);

> >> >  int main(int argc, char *argv[])
> >> > @@ -128,7 +129,7 @@ int main(int argc, char *argv[])
> >> >  	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
> >> >  			(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >> >  			(char *)&return_buffer);
> >> > -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
> >> > +	do_compare(rc, "callrpc", &buffer, return_buffer);

> >> >  	server_sin.sin_port = 0;
> >> >  	sock = RPC_ANYSOCK;
> >> > @@ -145,7 +146,7 @@ int main(int argc, char *argv[])
> >> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >> >  				(char *)&return_buffer, timeout);
> >> >  	clnt_destroy(clnt);
> >> > -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
> >> > +	do_compare(rc, "udp transport", &buffer, return_buffer);

> >> >  	server_sin.sin_port = 0;
> >> >  	sock = RPC_ANYSOCK;
> >> > @@ -160,12 +161,13 @@ int main(int argc, char *argv[])
> >> >  				(char *)&buffer, (xdrproc_t)xdr_receive_data,
> >> >  				(char *)&return_buffer, timeout);
> >> >  	clnt_destroy(clnt);
> >> > -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
> >> > +	do_compare(rc, "tcp transport", &buffer, return_buffer);

> >> >  	exit(0);
> >> >  }

> >> > -void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
> >> > +void do_compare(int rpc_rc, char *msg, struct data *buffer,
> >> > +			struct data *ret_buffer)
> >> >  {
> >> >  	int rc;

> >> > @@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
> >> >  		printf("\n");
> >> >  		exit(1);
> >> >  	}
> >> > -	rc = memcmp(buffer->data, ret_data, buffer->data_length);
> >> > +	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
> >> >  	if (rc) {
> >> >  		printf("Data compare for %s returned %d\n", msg, rc);
> >> >  		exit(1);
> >> > -- 
> >> > 1.8.3.1

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH v2] rpc01: fix variable not initialized

[Hongchen Zhang]

when error occurred in function callrpc/clnt_call, return_buffer may
be leaved not initialized.
As Petr said, we should check the return value before retrieve the
return_buffer->data. Change do_compare's parameter from char * to
struct data * to fix it.

Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
---
 testcases/network/rpc/basic_tests/rpc01/rpc1.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
index bc9f35b..8ef0e4d 100644
--- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
+++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
@@ -18,7 +18,8 @@ char *file_name = NULL;
 char host_name[100];
 long host_address;
 
-void do_compare(int, char *, struct data *, char *);
+void do_compare(int rpc_rc, char *msg, struct data *buffer,
+			struct data *ret_buffer);
 void usage_error(char *program_name);
 
 int main(int argc, char *argv[])
@@ -128,7 +129,7 @@ int main(int argc, char *argv[])
 	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
 			(char *)&buffer, (xdrproc_t)xdr_receive_data,
 			(char *)&return_buffer);
-	do_compare(rc, "callrpc", &buffer, return_buffer->data);
+	do_compare(rc, "callrpc", &buffer, return_buffer);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -145,7 +146,7 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "udp transport", &buffer, return_buffer->data);
+	do_compare(rc, "udp transport", &buffer, return_buffer);
 
 	server_sin.sin_port = 0;
 	sock = RPC_ANYSOCK;
@@ -160,12 +161,13 @@ int main(int argc, char *argv[])
 				(char *)&buffer, (xdrproc_t)xdr_receive_data,
 				(char *)&return_buffer, timeout);
 	clnt_destroy(clnt);
-	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
+	do_compare(rc, "tcp transport", &buffer, return_buffer);
 
 	exit(0);
 }
 
-void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
+void do_compare(int rpc_rc, char *msg, struct data *buffer,
+			struct data *ret_buffer)
 {
 	int rc;
 
@@ -175,7 +177,7 @@ void do_compare(int rpc_rc, char *msg, struct data *buffer, char *ret_data)
 		printf("\n");
 		exit(1);
 	}
-	rc = memcmp(buffer->data, ret_data, buffer->data_length);
+	rc = memcmp(buffer->data, ret_buffer->data, buffer->data_length);
 	if (rc) {
 		printf("Data compare for %s returned %d\n", msg, rc);
 		exit(1);
-- 
1.8.3.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] rpc01: fix variable not initialized

[Hongchen Zhang]

On 2022/7/11 下午2:09, Petr Vorel wrote:
> Hi all,
> 
> [ Cc Steve and libtirpc-devel ML ]
> 
>> when error occurred in function callrpc/clnt_call, return_buffer may
>> be leaved not initialized.So initialize return_buffer to NULL,and
>> retrieve the return_buffer->data when return_buffer is really assigned.
> 
> Shouldn't be rc used for verification?
> 
> man callrpc(3):
> int callrpc(...);
> ...
> This routine returns zero if it succeeds, or the value of enum clnt_stat cast to
> an integer if it fails. The routine clnt_perrno() is handy for translating
> failure statuses into messages.
> 
> Kind regards,
> Petr
> 
>> Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
>> ---
>>   testcases/network/rpc/basic_tests/rpc01/rpc1.c | 11 +++++++----
>>   1 file changed, 7 insertions(+), 4 deletions(-)
> 
>> diff --git a/testcases/network/rpc/basic_tests/rpc01/rpc1.c b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> index bc9f35b..5691c06 100644
>> --- a/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> +++ b/testcases/network/rpc/basic_tests/rpc01/rpc1.c
>> @@ -24,7 +24,7 @@ void usage_error(char *program_name);
>>   int main(int argc, char *argv[])
>>   {
>>   	struct hostent *hp;
>> -	struct data buffer, *return_buffer;
>> +	struct data buffer, *return_buffer = NULL;
>>   	int i, n, rc;
>>   	FILE *fp;
>>   	struct stat stat_buffer;
>> @@ -128,7 +128,8 @@ int main(int argc, char *argv[])
>>   	rc = callrpc(server, program, version, 1, (xdrproc_t)xdr_send_data,
>>   			(char *)&buffer, (xdrproc_t)xdr_receive_data,
>>   			(char *)&return_buffer);
>> -	do_compare(rc, "callrpc", &buffer, return_buffer->data);
>> +	do_compare(rc, "callrpc", &buffer,
>> +				return_buffer ? return_buffer->data : NULL);
> 
>>   	server_sin.sin_port = 0;
>>   	sock = RPC_ANYSOCK;
>> @@ -145,7 +146,8 @@ int main(int argc, char *argv[])
>>   				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>>   				(char *)&return_buffer, timeout);
>>   	clnt_destroy(clnt);
>> -	do_compare(rc, "udp transport", &buffer, return_buffer->data);
>> +	do_compare(rc, "udp transport", &buffer,
>> +				return_buffer ? return_buffer->data : NULL);
> 
>>   	server_sin.sin_port = 0;
>>   	sock = RPC_ANYSOCK;
>> @@ -160,7 +162,8 @@ int main(int argc, char *argv[])
>>   				(char *)&buffer, (xdrproc_t)xdr_receive_data,
>>   				(char *)&return_buffer, timeout);
>>   	clnt_destroy(clnt);
>> -	do_compare(rc, "tcp transport", &buffer, return_buffer->data);
>> +	do_compare(rc, "tcp transport", &buffer,
>> +				return_buffer ? return_buffer->data : NULL);
> 
>>   	exit(0);
>>   }
Hi Petr,
   I have modified as you said and have send another patch,the new 
method is to change the parameter passed to do_compare, please check again.

Best Regards,
Hongchen


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp