From: Thomas Huth <thuth@redhat.com>
To: ghorges <ghorges@xiyoulinux.org>,
qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>, Riku Voipio <riku.voipio@iki.fi>
Subject: Re: [Qemu-devel] Wshadow in qemu/linux-user/syscall.c
Date: Mon, 8 Apr 2019 12:32:48 +0200 [thread overview]
Message-ID: <351ee1e0-578e-3c7f-b0c1-a5617a1ef4a6@redhat.com> (raw)
In-Reply-To: <20190408084056.26212-1-ghorges@xiyoulinux.org>
Hi,
thanks for your patch! But please add a short patch description (beside
the subject), e.g. "Change the name of some variables so that the code
can be compiled with -Wshadow, too".
And you've got to put a "Signed-off-by" line at the end of the patch
description, too. See this URL for details:
https://wiki.qemu.org/Contribute/SubmitAPatch#Patch_emails_must_include_a_Signed-off-by:_line
For future patches to files in the linux-user directory, please also CC:
the maintainers of this subsystem (i.e. Ruku Voipio and Laurent Vivier,
see MAINTAINERS file).
Thanks,
Thomas
On 08/04/2019 10.40, ghorges wrote:
> ---
> linux-user/syscall.c | 66 ++++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 208fd1813d..985095e4d5 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -8240,7 +8240,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> size_t size;
> } sig, *sig_ptr;
>
> - abi_ulong arg_sigset, arg_sigsize, *arg7;
> + abi_ulong arg_sigset, arg_sigsize, *arg7s;
> target_sigset_t *target_sigset;
>
> n = arg1;
> @@ -8280,13 +8280,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> sig_ptr = &sig;
> sig.size = SIGSET_T_SIZE;
>
> - arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
> - if (!arg7) {
> + arg7s = lock_user(VERIFY_READ, arg6, sizeof(*arg7s) * 2, 1);
> + if (!arg7s) {
> return -TARGET_EFAULT;
> }
> - arg_sigset = tswapal(arg7[0]);
> - arg_sigsize = tswapal(arg7[1]);
> - unlock_user(arg7, arg6, 0);
> + arg_sigset = tswapal(arg7s[0]);
> + arg_sigsize = tswapal(arg7s[1]);
> + unlock_user(arg7s, arg6, 0);
>
> if (arg_sigset) {
> sig.set = &set;
> @@ -9479,14 +9479,14 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> }
> case TARGET_NR_getcpu:
> {
> - unsigned cpu, node;
> - ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL,
> + unsigned cpus, node;
> + ret = get_errno(sys_getcpu(arg1 ? &cpus : NULL,
> arg2 ? &node : NULL,
> NULL));
> if (is_error(ret)) {
> return ret;
> }
> - if (arg1 && put_user_u32(cpu, arg1)) {
> + if (arg1 && put_user_u32(cpus, arg1)) {
> return -TARGET_EFAULT;
> }
> if (arg2 && put_user_u32(node, arg2)) {
> @@ -10649,24 +10649,24 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_listxattr:
> case TARGET_NR_llistxattr:
> {
> - void *p, *b = 0;
> + void *q, *b = 0;
> if (arg2) {
> b = lock_user(VERIFY_WRITE, arg2, arg3, 0);
> if (!b) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> - if (p) {
> + q = lock_user_string(arg1);
> + if (q) {
> if (num == TARGET_NR_listxattr) {
> - ret = get_errno(listxattr(p, b, arg3));
> + ret = get_errno(listxattr(q, b, arg3));
> } else {
> - ret = get_errno(llistxattr(p, b, arg3));
> + ret = get_errno(llistxattr(q, b, arg3));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(b, arg2, arg3);
> return ret;
> }
> @@ -10686,25 +10686,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_setxattr:
> case TARGET_NR_lsetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_READ, arg3, arg4, 1);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_setxattr) {
> - ret = get_errno(setxattr(p, n, v, arg4, arg5));
> + ret = get_errno(setxattr(q, n, v, arg4, arg5));
> } else {
> - ret = get_errno(lsetxattr(p, n, v, arg4, arg5));
> + ret = get_errno(lsetxattr(q, n, v, arg4, arg5));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, 0);
> }
> @@ -10731,25 +10731,25 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_getxattr:
> case TARGET_NR_lgetxattr:
> {
> - void *p, *n, *v = 0;
> + void *q, *n, *v = 0;
> if (arg3) {
> v = lock_user(VERIFY_WRITE, arg3, arg4, 0);
> if (!v) {
> return -TARGET_EFAULT;
> }
> }
> - p = lock_user_string(arg1);
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_getxattr) {
> - ret = get_errno(getxattr(p, n, v, arg4));
> + ret = get_errno(getxattr(q, n, v, arg4));
> } else {
> - ret = get_errno(lgetxattr(p, n, v, arg4));
> + ret = get_errno(lgetxattr(q, n, v, arg4));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> unlock_user(v, arg3, arg4);
> }
> @@ -10776,19 +10776,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_removexattr:
> case TARGET_NR_lremovexattr:
> {
> - void *p, *n;
> - p = lock_user_string(arg1);
> + void *q, *n;
> + q = lock_user_string(arg1);
> n = lock_user_string(arg2);
> - if (p && n) {
> + if (q && n) {
> if (num == TARGET_NR_removexattr) {
> - ret = get_errno(removexattr(p, n));
> + ret = get_errno(removexattr(q, n));
> } else {
> - ret = get_errno(lremovexattr(p, n));
> + ret = get_errno(lremovexattr(q, n));
> }
> } else {
> ret = -TARGET_EFAULT;
> }
> - unlock_user(p, arg1, 0);
> + unlock_user(q, arg1, 0);
> unlock_user(n, arg2, 0);
> }
> return ret;
>
next prev parent reply other threads:[~2019-04-08 10:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-08 8:40 [Qemu-devel] Wshadow in qemu/linux-user/syscall.c ghorges
2019-04-08 8:40 ` ghorges
2019-04-08 9:29 ` no-reply
2019-04-08 9:29 ` no-reply
2019-04-08 10:32 ` Thomas Huth [this message]
2019-04-08 10:32 ` Thomas Huth
2019-04-08 10:39 ` Kevin Wolf
2019-04-08 10:39 ` Kevin Wolf
2019-04-08 11:19 ` 马艺诚
2019-04-08 11:19 ` 马艺诚
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=351ee1e0-578e-3c7f-b0c1-a5617a1ef4a6@redhat.com \
--to=thuth@redhat.com \
--cc=ghorges@xiyoulinux.org \
--cc=lvivier@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/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).