From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B8AF17C9B for ; Thu, 3 Oct 2024 02:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727924185; cv=none; b=irgv/gBk8P6FA1d4btTj7ffyz/U2XWPy3ah8bze9nQykscsTPSoKbJDmZ1MrlGoC79e2CuQgXMbEAWG7mm5IfOE+Go09PBmA/siN3i01gBtpNE0Ze3bE8a6BDiAYxEmxcfQomMwkKS+EQzOL1E6+WEYovdyLInVVyK5/K9eCqzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727924185; c=relaxed/simple; bh=kl1fOyX8Mg5UwZoUagBtC6w6Gl2iDoAhVse2GFXBEqA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PfJCZcpx3WXxNdxwCRxbQtBxMQuAtZPwk5EvOggCVnLmlbWgQ0VUftqpYxGjsYKpf4wn+O6SwWgX35ggtr5Hf/oVNJVLBSnUwL7m3x7ptilwa91GCZtmq7RDjI2QfbJcsuHMxuWISrq/venUfFsvJOyUZMazrVvYyD5aqO8dAnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=RBpOBv6g; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="RBpOBv6g" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-7e6bb2aa758so171750a12.2 for ; Wed, 02 Oct 2024 19:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1727924183; x=1728528983; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=BzabvJfQ/mT0r3c3amjc5i3OTEfJmiDAnNtgqnaCdRU=; b=RBpOBv6gmajN+QL9EEpWxfO+VGffQXa8g9uWSV5Uoms48YF2nIJryWh3pEZfYxXqwG im5QgXntlNIH4OvbfrvpXluoC4IpbqrAntiwqJf4DAhfKMoZlxDj5lyJzMvd167/Vqt9 6GAK3fgKD6SXqbHwIgBEzg9tLKjsYFnzwve6JbA+r2QKHcrcHgmc9ri9HIUR2P1H6Ci+ fvRYht4GB4tW6XT4b8caRcefOBcc1d09x3ZMY2s/yoMLWAxuiQlsfv23Zs35+GxLj4UN S7/CA5Jd0ZKvceYPtDQdLCm850zh+C2dUn42rrB2BjpoALRHvHKj1PpKStES5KG/GUUY EXaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727924183; x=1728528983; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BzabvJfQ/mT0r3c3amjc5i3OTEfJmiDAnNtgqnaCdRU=; b=owTMvPfBfT6ptMWjo0wmbakSeKHJ5DvMixqF+JYjfHnbkX6fKeWFEeobxlw2ydZdQt GBW6GSq8KRPCxHIBubB5iZ5uQk0rRjciGTpY4TpVZgmqa9X03CsZPqGzrHp9DJ712JG5 ZA3hy+tmdnthD5lS56pfYYAJwCFTL/yD4lyuomPYR/bBc2yEMYJNBD6yKTyP0Ssvgskr kUY2uaw5MgCKA3SvWoH8qwuWlgqDsfVTZXYbFN1VAjI9pe2EYoyPN8OpIIwzs2meNDP2 eOcmMkgTpV6M17mBcRTqC+xyQlqpcGsv71qy2nvV8s6k9tA/TSPeIAwi2XxnLqqvjo+6 mcZg== X-Forwarded-Encrypted: i=1; AJvYcCXVaVrH6NEFN5cRIRei2TiYZZDm70zg+i/9TuyzfLpg6LS3jbM5eqdKtt8/bxBOwo0kWC7vIxGUWId8FFA=@vger.kernel.org X-Gm-Message-State: AOJu0YzGTx2N6WhZo9ySNlI9m/uJwjUJaCviZH8Mairn7F4SVGkGUP87 1jTS3K96upklJm2ZzWePi/lMvksIjxOeSZi2w9sVgsiNEIEnnUToowNJJxIKUAw= X-Google-Smtp-Source: AGHT+IFXE3gM6q0uiiKf0/18+ft5mNZG0Y2jhcNr77uRDbzfVN1+WvKiV64lUWP2C2WN057Sh63uJA== X-Received: by 2002:a17:90b:368c:b0:2d8:e7db:9996 with SMTP id 98e67ed59e1d1-2e18466e1aemr6024553a91.13.1727924183457; Wed, 02 Oct 2024 19:56:23 -0700 (PDT) Received: from x1 (71-34-69-82.ptld.qwest.net. [71.34.69.82]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e1bfd2a07fsm293022a91.41.2024.10.02.19.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 19:56:23 -0700 (PDT) Date: Wed, 2 Oct 2024 19:56:21 -0700 From: Drew Fustini To: clingfei Cc: drew@pdp7.com, guoren@kernel.org, wefu@redhat.com, linus.walleij@linaro.org, linux-riscv@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] pinctrl: fix Null pointer dereference Message-ID: References: <20241003023307.2138695-1-clf700383@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241003023307.2138695-1-clf700383@gmail.com> On Thu, Oct 03, 2024 at 10:33:07AM +0800, clingfei wrote: > pinmux_generic_get_function may returns NULL, and its retval is > dereferenced without check, which will cause a null pointer dereference. > > Signed-off-by: clingfei > --- > drivers/pinctrl/pinctrl-th1520.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/pinctrl/pinctrl-th1520.c b/drivers/pinctrl/pinctrl-th1520.c > index 1bb78b212fd5..9331f4462480 100644 > --- a/drivers/pinctrl/pinctrl-th1520.c > +++ b/drivers/pinctrl/pinctrl-th1520.c > @@ -798,6 +798,8 @@ static int th1520_pinmux_set_mux(struct pinctrl_dev *pctldev, > struct th1520_pinctrl *thp = pinctrl_dev_get_drvdata(pctldev); > const struct function_desc *func = pinmux_generic_get_function(pctldev, fsel); > > + if (!func) > + return -EINVAL; > return th1520_pinmux_set(thp, thp->desc.pins[gsel].number, > (uintptr_t)thp->desc.pins[gsel].drv_data & TH1520_PAD_MUXDATA, > (uintptr_t)func->data); > -- > 2.34.1 Thanks for fixing the formating in the previous attempt. As Kees Bakker noted [1], I failed to have this check in my v3 patch series. This fix makes pinctrl-th1520 behave the same as other drivers that call pinmux_generic_get_function() like pinctrl-single. I have applied your patch and the driver still works as expected on my LPi4a. Hopefully Linus can apply this fix on top of my v3 series. Reviewed-by: Drew Fustini -Drew [1] https://lore.kernel.org/lkml/87770518-5f63-4adf-b6ea-c7f92b58ce22@ijzerbout.nl/