From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 21 Aug 2016 19:45:14 +0000 Subject: [PATCH 2/2] ALSA: compress: Reduce the scope for two variables in snd_compr_set_params() Message-Id: <03eac1fe-ff33-1759-9c2a-7914f1c6de45@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <7233eb00-a941-4935-dce2-7cb907272d41@users.sourceforge.net> In-Reply-To: <7233eb00-a941-4935-dce2-7cb907272d41@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai , Vinod Koul Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Sun, 21 Aug 2016 21:26:18 +0200 Reduce the scope for the local variables to an if branch. Signed-off-by: Markus Elfring --- sound/core/compress_offload.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 583d407..b43aec5 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -545,14 +545,14 @@ static int snd_compress_check_input(struct snd_compr_params *params) static int snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) { - struct snd_compr_params *params; - int retval; - if (stream->runtime->state = SNDRV_PCM_STATE_OPEN) { /* * we should allow parameter change only when stream has been * opened not in other cases */ + int retval; + struct snd_compr_params *params; + params = memdup_user((void __user *)arg, sizeof(*params)); if (IS_ERR(params)) return PTR_ERR(params); @@ -578,12 +578,12 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->runtime->state = SNDRV_PCM_STATE_SETUP; else stream->runtime->state = SNDRV_PCM_STATE_PREPARED; +out: + kfree(params); + return retval; } else { return -EPERM; } -out: - kfree(params); - return retval; } static int -- 2.9.3