From: wei.guo.simon@gmail.com
To: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman <mpe@ellerman.id.au>,
Anshuman Khandual <khandual@linux.vnet.ibm.com>,
Simon Guo <wei.guo.simon@gmail.com>
Subject: [PATCH] powerpc/ptrace: Fix cppcheck issue in gpr32_set_common/gpr32_get_common.
Date: Sat, 20 Aug 2016 20:24:23 +0800 [thread overview]
Message-ID: <1471695863-8660-1-git-send-email-wei.guo.simon@gmail.com> (raw)
From: Simon Guo <wei.guo.simon@gmail.com>
The ckpt_regs usage in gpr32_set_common/gpr32_get_common()
will lead to cppcheck error.
[arch/powerpc/kernel/ptrace.c:2062]: (error) Uninitialized variable: ckpt_regs
[arch/powerpc/kernel/ptrace.c:2130]: (error) Uninitialized variable: ckpt_regs
A straightforward fix to clean it.
Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Simon Guo <wei.guo.simon@gmail.com>
---
arch/powerpc/kernel/ptrace.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 4f3c575..ae02377 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -2046,21 +2046,23 @@ static const struct user_regset_view user_ppc_native_view = {
static int gpr32_get_common(struct task_struct *target,
const struct user_regset *regset,
unsigned int pos, unsigned int count,
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
void *kbuf, void __user *ubuf, bool tm_active)
+#else
+ void *kbuf, void __user *ubuf)
+#endif
{
const unsigned long *regs = &target->thread.regs->gpr[0];
- const unsigned long *ckpt_regs;
compat_ulong_t *k = kbuf;
compat_ulong_t __user *u = ubuf;
compat_ulong_t reg;
int i;
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
- ckpt_regs = &target->thread.ckpt_regs.gpr[0];
-#endif
if (tm_active) {
- regs = ckpt_regs;
+ regs = &target->thread.ckpt_regs.gpr[0];
} else {
+#endif
if (target->thread.regs == NULL)
return -EIO;
@@ -2072,7 +2074,9 @@ static int gpr32_get_common(struct task_struct *target,
for (i = 14; i < 32; i++)
target->thread.regs->gpr[i] = NV_REG_POISON;
}
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
}
+#endif
pos /= sizeof(reg);
count /= sizeof(reg);
@@ -2114,28 +2118,31 @@ static int gpr32_get_common(struct task_struct *target,
static int gpr32_set_common(struct task_struct *target,
const struct user_regset *regset,
unsigned int pos, unsigned int count,
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
const void *kbuf, const void __user *ubuf, bool tm_active)
+#else
+ const void *kbuf, const void __user *ubuf)
+#endif
{
unsigned long *regs = &target->thread.regs->gpr[0];
- unsigned long *ckpt_regs;
const compat_ulong_t *k = kbuf;
const compat_ulong_t __user *u = ubuf;
compat_ulong_t reg;
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
- ckpt_regs = &target->thread.ckpt_regs.gpr[0];
-#endif
-
if (tm_active) {
- regs = ckpt_regs;
+ regs = &target->thread.ckpt_regs.gpr[0];
} else {
+#endif
regs = &target->thread.regs->gpr[0];
if (target->thread.regs == NULL)
return -EIO;
CHECK_FULL_REGS(target->thread.regs);
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
}
+#endif
pos /= sizeof(reg);
count /= sizeof(reg);
@@ -2218,7 +2225,11 @@ static int gpr32_get(struct task_struct *target,
unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf)
{
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
return gpr32_get_common(target, regset, pos, count, kbuf, ubuf, 0);
+#else
+ return gpr32_get_common(target, regset, pos, count, kbuf, ubuf);
+#endif
}
static int gpr32_set(struct task_struct *target,
@@ -2226,7 +2237,11 @@ static int gpr32_set(struct task_struct *target,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
return gpr32_set_common(target, regset, pos, count, kbuf, ubuf, 0);
+#else
+ return gpr32_set_common(target, regset, pos, count, kbuf, ubuf);
+#endif
}
/*
--
1.8.3.1
next reply other threads:[~2016-08-23 2:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-20 12:24 wei.guo.simon [this message]
2016-08-24 2:21 ` [PATCH] powerpc/ptrace: Fix cppcheck issue in gpr32_set_common/gpr32_get_common Daniel Axtens
2016-08-24 7:38 ` Simon Guo
2016-08-25 1:06 ` Daniel Axtens
2016-09-09 10:52 ` Michael Ellerman
2016-09-11 12:07 ` Simon Guo
2016-09-12 1:55 ` Michael Ellerman
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=1471695863-8660-1-git-send-email-wei.guo.simon@gmail.com \
--to=wei.guo.simon@gmail.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).