From: Markus Elfring <Markus.Elfring@web.de>
To: linux-sound@vger.kernel.org, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Cc: Julia Lawall <julia.lawall@inria.fr>
Subject: [PATCH] ALSA: emu10k1: Refactor copy_to_user() usage in snd_emu10k1_fx8010_ioctl()
Date: Sun, 15 Sep 2024 16:24:25 +0200 [thread overview]
Message-ID: <c288ff88-4bb2-4d51-8fd5-2c626c3963b7@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 15 Sep 2024 16:16:45 +0200
Assign values from selected expressions where copy_to_user() calls
are involved to additional local variables so that the number of
kfree() calls can be reduced accordingly.
This issue was transformed by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
sound/pci/emu10k1/emufx.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 03efc317e05f..2f20878a78c9 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -2496,12 +2496,12 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
if (!info)
return -ENOMEM;
snd_emu10k1_fx8010_info(emu, info);
- if (copy_to_user(argp, info, sizeof(*info))) {
+
+ {
+ unsigned long ctu = copy_to_user(argp, info, sizeof(*info));
kfree(info);
- return -EFAULT;
+ return ctu ? -EFAULT : 0;
}
- kfree(info);
- return 0;
case SNDRV_EMU10K1_IOCTL_CODE_POKE:
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -2517,12 +2517,12 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
if (IS_ERR(icode))
return PTR_ERR(icode);
res = snd_emu10k1_icode_peek(emu, icode);
- if (res == 0 && copy_to_user(argp, icode, sizeof(*icode))) {
+
+ {
+ bool ctu = res == 0 && copy_to_user(argp, icode, sizeof(*icode));
kfree(icode);
- return -EFAULT;
+ return ctu ? -EFAULT : res;
}
- kfree(icode);
- return res;
case SNDRV_EMU10K1_IOCTL_PCM_POKE:
ipcm = memdup_user(argp, sizeof(*ipcm));
if (IS_ERR(ipcm))
@@ -2535,12 +2535,12 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
if (IS_ERR(ipcm))
return PTR_ERR(ipcm);
res = snd_emu10k1_ipcm_peek(emu, ipcm);
- if (res == 0 && copy_to_user(argp, ipcm, sizeof(*ipcm))) {
+
+ {
+ bool ctu = res == 0 && copy_to_user(argp, ipcm, sizeof(*ipcm));
kfree(ipcm);
- return -EFAULT;
+ return ctu ? -EFAULT : res;
}
- kfree(ipcm);
- return res;
case SNDRV_EMU10K1_IOCTL_TRAM_SETUP:
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
--
2.46.0
next reply other threads:[~2024-09-15 14:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-15 14:24 Markus Elfring [this message]
2024-09-16 7:20 ` [PATCH] ALSA: emu10k1: Refactor copy_to_user() usage in snd_emu10k1_fx8010_ioctl() Takashi Iwai
2024-09-16 7:33 ` Markus Elfring
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=c288ff88-4bb2-4d51-8fd5-2c626c3963b7@web.de \
--to=markus.elfring@web.de \
--cc=julia.lawall@inria.fr \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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