From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9486CC64EB8 for ; Tue, 9 Oct 2018 14:51:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5652F214C4 for ; Tue, 9 Oct 2018 14:51:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5652F214C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726647AbeJIWJD (ORCPT ); Tue, 9 Oct 2018 18:09:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:36756 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726415AbeJIWJC (ORCPT ); Tue, 9 Oct 2018 18:09:02 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8B38AAFFB; Tue, 9 Oct 2018 14:51:43 +0000 (UTC) Date: Tue, 09 Oct 2018 16:51:43 +0200 Message-ID: From: Takashi Iwai To: "Wenwen Wang" Cc: "moderated list:SOUND" , "Jaroslav Kysela" , "Kangjie Lu" , "open list" Subject: Re: [PATCH] ALSA: intel8x0: fix a redundant check bug In-Reply-To: <1539095754-5609-1-git-send-email-wang6495@umn.edu> References: <1539095754-5609-1-git-send-email-wang6495@umn.edu> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/26 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 09 Oct 2018 16:35:52 +0200, Wenwen Wang wrote: > > In snd_intel8x0_codec_semaphore(), the parameter 'codec' is firstly > checked to see whether it is greater than 2. If yes, an error code EIO is > returned. Otherwise, 'chip->in_sdin_init' is further checked. If > 'chip->in_sdin_init' is not zero, 'codec' is updated immediately with > 'chip->codec_isr_bits'. That means, the parameter 'codec' is not used in > this branch. Actually, it is only used in the else branch when > 'chip->in_sdin_init' is zero. Thus, the check on the parameter 'codec' is > redundant if 'chip->in_sdin_init' is not zero. This can cause potential > incorrect execution in this function. Suppose the parameter 'codec' is 3, > which is greater than 2, and 'chip->in_sdin_init' is not zero. The current > version of this function will return EIO after the first check because > 'codec' is greater than 2. However, since 'codec' will be updated in the > following execution when 'chip->in_sdin_init' is not zero, this check will > be meaningless and the execution should continue, instead of returning the > error code EIO. > > This patch avoids the above issue by moving the check on the parameter > 'codec' to the else branch of the if statement that checks > 'chip->in_sdin_init'. > > Signed-off-by: Wenwen Wang Passing codec > 2 is just incorrect, no matter whether it's in in_sdin_init state of not. In the in_sdin_init state, it's supposed to be ignored, but still passing such a value is already wrong. That said, there is no need to skip the check. Of course, if your patch fixes any real issue (i.e. a bug), I'll happily apply the patch. In that case, please show the exact use case that hits the bug. thanks, Takashi > --- > sound/pci/intel8x0.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c > index 5ee468d..f619e58 100644 > --- a/sound/pci/intel8x0.c > +++ b/sound/pci/intel8x0.c > @@ -515,13 +515,13 @@ static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int code > { > int time; > > - if (codec > 2) > - return -EIO; > if (chip->in_sdin_init) { > /* we don't know the ready bit assignment at the moment */ > /* so we check any */ > codec = chip->codec_isr_bits; > } else { > + if (codec > 2) > + return -EIO; > codec = chip->codec_bit[chip->ac97_sdin[codec]]; > } > > -- > 2.7.4 > >