From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 F07EE185939 for ; Wed, 16 Oct 2024 18:15:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729102514; cv=none; b=pLRGqBLBhe7pEd3o0sJHKqimmFGF1HnTtA+ZXNdNR1D75p+kXblcehkBjhAxf8tAFv++t9KR6M4S4q6HXQeodxCz1mSqEstl4khcZ71WFGvVJ8tGQKPBxvOsTfvD3MW6198WbDdnVbMAAYd05K8zZm8E4XR/9t3+4rQ0DtMgs+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729102514; c=relaxed/simple; bh=mAq4AoMlxKysGb+Itk7iEnVK5aXThmWxihuz2MsOgLw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mwiL5FZ7/91KUkfICiXdtvhcnCsZnPt1XD1g6CRU04IqscT+NWqEK1I3sHJMuuur6TruT25RnLSk6k8Qj78HKWNSvY1aZ7SNuDLQNftDzMtKJHuwnA/wVCAdia6lwdyxua6CtmRlHZUP/uHqHxy/1tOiX01NmC4ejU+HbchyPOE= 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=INR2+jAJ; arc=none smtp.client-ip=209.85.216.45 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="INR2+jAJ" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2e06acff261so65888a91.2 for ; Wed, 16 Oct 2024 11:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1729102512; x=1729707312; 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=fkgg/XiYmuwxuU0YWtVe0AMhNojrUfbhQVkInOv4lBU=; b=INR2+jAJbEwk/lqh9HxvjvDKHVEst9SoQW9s8r6q1l9gNdRlwMt7lB0U8Rv4Ce/VKh bbMUgunkwVNGIuPffvvG272pEFNuHhPcY2xNY1KAyh2z+IzA3n/iK01CoE2BZlZdfMve OWDJtiEJAV2GyvgZKIqV7xV3uMfVH7xM8S9QOrGGHK7feucyBKHpQRG/GhZvBoVSra1N pHNXqM+J8oI4q1sd8rZ0hEZVxgulCT/WSk7QI9oPfHs35nM8hk/0BmolQETnjpZklpA5 zkTVRe0I5IsUI+Hh7d2jGcdWzaKkv+aYI7Fl/oMFXaxzTj4shtYW9IePVYaOp8d6y4ex qhZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729102512; x=1729707312; 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=fkgg/XiYmuwxuU0YWtVe0AMhNojrUfbhQVkInOv4lBU=; b=q+zWwQqUwVMiIgXZ9ZnNpcJ/0TP18Rg+krD5oAmWWoNajjWqdu0YoK75MrlvhMomF7 ESGqwzs3y7QoV3WkQGFtSLUA9wtDsJ0DyrgnyS8E/ieGgpMo8fxc14/BIl/ThkyAIn89 R2GRtncAJURHgkArFEWBnNJWydcyM+t6bLUT4xXB4sjP56EWBUFpJaT0jj1QAGLWOjHl pGEovcocuI7r2vFTeCu0ispY4ulNfMhJfIQWsuwEQzWWh3lS/0eIbHqolJhQQd8xMWdQ T8pMIgqNJdYkdOt+uB9vsbTkJM5hU5BFe+8C2gUPmEFKusHuyEaq4UWFuYwCAGeooPEf 9UsA== X-Forwarded-Encrypted: i=1; AJvYcCW7wUlAGJPAxFSTtNPYhGOc8QZOsudHQkquCYQHBV2dZhqcYYgg5MLU9aNjPPGEydiPf4s0vXDtUjNAntM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7M1Tmu8LoLmW5mmhlvKOMKcIqNHpzuB4HmJI1jxc4D+yrE3l5 XHElIjPSQCl2B9kDjsC+lNIw0NaRaX07G6M7UvnECl66O14/Rjp5Q6wO3KNgBuY= X-Google-Smtp-Source: AGHT+IFPs/1VOYlgs8ynT/CESZBXXAGDk0R6M8OaJ6CAurUUdtWENPzhZVi9D9E3OSJvDP5dBev+bQ== X-Received: by 2002:a17:90a:5647:b0:2e1:682b:361a with SMTP id 98e67ed59e1d1-2e3ab8bb22bmr5177503a91.28.1729102512217; Wed, 16 Oct 2024 11:15:12 -0700 (PDT) Received: from x1 (71-34-69-82.ptld.qwest.net. [71.34.69.82]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e3e08d082dsm79600a91.23.2024.10.16.11.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 11:15:11 -0700 (PDT) Date: Wed, 16 Oct 2024 11:15:10 -0700 From: Drew Fustini To: Colin Ian King Cc: Drew Fustini , Guo Ren , Fu Wei , Linus Walleij , Emil Renner Berthing , linux-riscv@lists.infradead.org, linux-gpio@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] pinctrl: th1520: Fix potential null pointer dereference on func Message-ID: References: <20241016155655.334518-1-colin.i.king@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: <20241016155655.334518-1-colin.i.king@gmail.com> On Wed, Oct 16, 2024 at 04:56:55PM +0100, Colin Ian King wrote: > The initialization of muxtype deferences pointer func before func > is sanity checked with a null pointer check, hence we have a null > pointer deference issue. Fix this by only deferencing func with > the assignment to muxtype after func has been null pointer checked. > > Fixes: 1fc30cd92770 ("pinctrl: th1520: Factor out casts") > Signed-off-by: Colin Ian King > --- > drivers/pinctrl/pinctrl-th1520.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/pinctrl-th1520.c b/drivers/pinctrl/pinctrl-th1520.c > index 7474d8da32f9..e641bad6728c 100644 > --- a/drivers/pinctrl/pinctrl-th1520.c > +++ b/drivers/pinctrl/pinctrl-th1520.c > @@ -803,11 +803,12 @@ 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); > - enum th1520_muxtype muxtype = (uintptr_t)func->data; > + enum th1520_muxtype muxtype; > > if (!func) > return -EINVAL; > > + muxtype = (uintptr_t)func->data; > return th1520_pinmux_set(thp, thp->desc.pins[gsel].number, > th1520_pad_muxdata(thp->desc.pins[gsel].drv_data), > muxtype); > -- > 2.39.5 > Acked-by: Drew Fustini I've tested this on top of next-20241016 on the BeagleV Ahead and LicheePi 4A. thanks, drew