Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 13 Nov 2019 11:36:45 +0100
Message-ID: <s5hlfsknjuq.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Pavel Machek <pavel@denx.de>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [PATCH 4.19 062/125] ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()
In-Reply-To: <s5hmud0njx7.wl-tiwai@suse.de>
References: <20191111181438.945353076@linuxfoundation.org>
        <20191111181448.565879068@linuxfoundation.org>
        <20191113101954.GA32553@amd>
        <s5hmud0njx7.wl-tiwai@suse.de>
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/25.3
 (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

On Wed, 13 Nov 2019 11:35:16 +0100,
Takashi Iwai wrote:
> 
> On Wed, 13 Nov 2019 11:19:54 +0100,
> Pavel Machek wrote:
> > 
> > Hi!
> > 
> > > From: Takashi Iwai <tiwai@suse.de>
> > > 
> > > commit 60849562a5db4a1eee2160167e4dce4590d3eafe upstream.
> > > 
> > > The previous addition of descriptor validation may lead to a NULL
> > > dereference at create_yamaha_midi_quirk() when either injd or outjd is
> > > NULL.  Add proper non-NULL checks.
> > 
> > This is wrong.
> > 
> > > @@ -259,8 +259,8 @@ static int create_yamaha_midi_quirk(stru
> > >  					NULL, USB_MS_MIDI_OUT_JACK);
> > >  	if (!injd && !outjd)
> > >  		return -ENODEV;
> > 
> > Clearly code wants to allow at most one of them to be NULL.
> > 
> > > -	if (!snd_usb_validate_midi_desc(injd) ||
> > > -	    !snd_usb_validate_midi_desc(outjd))
> > > +	if (!(injd && snd_usb_validate_midi_desc(injd)) ||
> > > +	    !(outjd && snd_usb_validate_midi_desc(outjd)))
> > >  		return -ENODEV;
> > 
> > Yet it will return here if it is. Correct check would be
> > 
> > +     if (!(!injd || snd_usb_validate_midi_desc(injd)) ||
> > +         !(!outjd || snd_usb_validate_midi_desc(outjd)))
> > 
> > AFAICT.
> 
> Erm, right, but a better representation is:
> 
> 	if ((injd && !snd_usb_validate_midi_desc(injd)) ||
> 	    (outjd && !snd_usb_validate_midi_desc(injd)))

Of course, another typo:

 	if ((injd && !snd_usb_validate_midi_desc(injd)) ||
 	    (outjd && !snd_usb_validate_midi_desc(outjd)))


Takashi