From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753362AbcHUTp6 (ORCPT ); Sun, 21 Aug 2016 15:45:58 -0400 Received: from mout.web.de ([217.72.192.78]:49435 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752863AbcHUTp4 (ORCPT ); Sun, 21 Aug 2016 15:45:56 -0400 Subject: [PATCH 2/2] ALSA: compress: Reduce the scope for two variables in snd_compr_set_params() To: alsa-devel@alsa-project.org, Jaroslav Kysela , Takashi Iwai , Vinod Koul References: <566ABCD9.1060404@users.sourceforge.net> <7233eb00-a941-4935-dce2-7cb907272d41@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <03eac1fe-ff33-1759-9c2a-7914f1c6de45@users.sourceforge.net> Date: Sun, 21 Aug 2016 21:45:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <7233eb00-a941-4935-dce2-7cb907272d41@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:IxyEPDYITtqqRvqHrKYGWpWOfOF8iNlTWIDbuxtALEaUen8xHHh C4ZVX9RhyX4ATDNEDzp/RN11e5WiRU/Jv6vA8qVgHHCkRjmzWQJ4L2wldSZ+aQ39sC/YABu tY2PdXB/tcprGUiIPnSmbKY/JI38R4zobCaNFLSBeWnWg3NrvARId3gvVHxT7zsSSxhGps4 OmLxUQwJ+AENPLkN0flwQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ud1rCuf9Jkg=:5oHGmsmB8JX9x5Td2zTWF9 qQL75rBHssIieiJFkNWYf3lUuuP+QVrJNDEzH2Tsn1e3lNC0fdhCTv+h46+ZUcmJ6HhitDyQW J7sekH/kTATMxeQHxd5Lkc2m5Wel+5ruo+WJZmYDyeqBe31PM+xTxVTzgzKOLICZOM1jbUge5 uZfkBkvdx3t+aqYnIyANOZkBirJtmbILi3P6SlPqwaVU7iUauL2qb8/ETDzryZq1/16WVaR8B Ij+Q1zKy3EZtpf4qP1nRx+XKY8/Am0L+0lE3/sd0shcDsMWu4uezjLpUaRJEOX0JY5kFQyoq8 xmP3TutArsUilbdtnsAC4sFQtS3waiAx8tjMyL1UWKthuoCJHIzVBMSDmMhGi9Ao9FCZAz6ow suZ81u56JK+LnwReMirPTnzvDLXtFnKv7cWCmsgSi9nt+UReKT5mjobNlIxb3f8Nl0zOoeh7G WH38PV4OqtUR69kYlSWGs3mL7CMlDzUfNfP2eKosoy4v+r3u9zImXTgQ/chnAGFVlkfMzNxnu hIfQV4ORB7FJddK/L4B6oYv5bJLL0LDCLHHqmaUW2bp1RDB9XPv/g5F+KIymozyVvfbgBTvpG KEVZbt5xE504pQ4pdIRyE+ItGc6qbIL1c5MGUAZFIqwEFQNI6nOo/oMXSzbvQrRKXzaXatnPB dbfDlmUssx6/ozk4WfW4+68D2UIse4nY54vSb/a4oI45R7mlwV42kV+32qCLM9O7Ejqk/fmDM fomaoW/47Cs+sssGdSnc1oe9lYc6qGVrr3LMeJsQGMWYuay1tpgn4xCiCK9CMG92HNnF0FSgH lPkpMX0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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