From nobody Sun Oct 5 18:12:40 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 702F621B18B; Thu, 31 Jul 2025 08:19:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753949979; cv=none; b=BZ5plbPQrFvuXoweRJy29sibLjeoJIesA7Wl7aFi6veZHGr9wAHcxU1eSxpwgjxGSBdISjNB+6ghmgW43qKzWGoZrI340Rq5qbMsl1U/prtc8ziolzIpLURUYo9s/C5W8eEaylhD4aJm+OW/O5xYcHNkUX+k3iGe1zaSpzse0EQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753949979; c=relaxed/simple; bh=/D82C5VUyCg6tc95xG3P27C0bxu2+XduLgcjnO07IjM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EqtzAlzlcWm6XPF/AmbkAU/s+Q6oa0YEUSmos9Hsy2yV7MdSihv22xiR6gOBDilJv90YyuRitjixKTT8/YQEFsGF9yIgupf5Y1cOEER93K4KnH+jCXj41aqEnee/gwxqB2coU/ASyFLZBKqXtJvp7ZaZ6m6X/TN/ByO+qFEfSgw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GfH1fz6Q; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GfH1fz6Q" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4561ed868b5so1072285e9.0; Thu, 31 Jul 2025 01:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753949976; x=1754554776; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w5BJ99XtInyXvA2uGwOyO0qKj3XQHqCW6pENyhyNWAo=; b=GfH1fz6QV9DS0G3roci61vO9S/JdkK1auctrWZ1uPBdEbaFTSTzteOfo/sEje6DuZm UPXhuLp1nElljvoPVG+WA+zaNXjpxU4NYBJgi1fILzE4mWNXt0LR6BN3+6L+EG4HA83z iFtZSWxG6rZoNKEITKU7qqE5BaW7KDk/hgCqn31zB1rqLS4QSzgqUCY7wvVYyvloUHE9 fgsGyoooS66mcp/xtp6ltsk1UQ9buGcio9ljuoladsNtVdo4f4n52hpZa958hkhZA7n/ HMOckXsCq+pVtsjHml5KBmmyNUjXaft5oktyPzzNRphGwayw2wIybgZhrZErtGAktnHF RUSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753949976; x=1754554776; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w5BJ99XtInyXvA2uGwOyO0qKj3XQHqCW6pENyhyNWAo=; b=tRnBVmNWhSJ6YwXt1Sy/CCvIA9tvr1FopHrUv0g66BsVus0hTXEqBn3RFfHv3z3Egy yOZtrC/VnGMC/JA/Nap9iijQAM5ZtkVQ0upKYgcGFAklCI8H0aaQmFoffZ5CoaGYMacm 0DE/qPrAG1HyVvF5LvtFAxu5c8ak/9jtXIb0nKJqIqgcTB1dcw6FHMw4jq1Xxvzii5mY 1MsuBv7uJAkW5Ft4+eYEVN6qNxuIIA16Ta2YhB/EvJxRRh2rajoRdAphmXcZUY9q3+pe /SJt0gZlM3dR0tvRvArk4GMCJLbEXUJRev6KppS5fU6S3TPa1NBhp9r/r1z6G5zLrd9B Et1w== X-Forwarded-Encrypted: i=1; AJvYcCVfjGKoYArkNI6eTSt9wvH4IJimsvC3+7TU+3/1hsSk4/+tK/wq5LoDj3+L9ENpfi+3aLbO1kLIhOUWr+8X@vger.kernel.org, AJvYcCXKW+ZhFOAe4co2KiFSl50EJXab5AJjwhUMSVQyEtxMWo8Hh/x9ioQujyPseL13v3+YgP6tFzUjCqwZFOT6@vger.kernel.org X-Gm-Message-State: AOJu0Yyb/C8yHKHLtqGyoEu9oFHnuP3GoB6p8QpbTTB1VAjbhCL3BGo0 ZWNLIbIHSQmvXT+AkQGWyb2aL2qJoqn26mizDproIPEnLsN2cnjdyL34 X-Gm-Gg: ASbGncsyDwVJzkx6Iv7ZO+OOVNrHT4V2Z4nLk+Djqb0aE4RufeD+x22Y85CxICHBDEO yDciD3d9IBqlXO2sp7YWeGGTKqDS4e5LsEyd7Z2poDykhA15/3wvU9EynZBcaPH4IIzggLBO99n xfEpmtH/Qqh3wyDwz0h/RUPqj0Vv19M01hFkLVhIENr4uqw02gX595RRbOjKgcfD09OmRB8tGqu TcEZRjH4BJfrnaqTRExm/osfTNGqyZZEv8rmIu3ood6oaxSOaJYoGMVC7AmWnGkKGooYKt5Cd0/ I8JPvdngnleQz7MEl0HB5K5R96ac2zyxnLX72d0LgA0oQWD7QEqK6GwbQYVZqWMLRhJNg6Djcdd L22/PDZkUvcASy/+vybA3 X-Google-Smtp-Source: AGHT+IFbDfRA6dDUCEXiNfEp5FpmNjxnhIKo5DM7lrIVBOPA+AS808AJxq+ydd9KurP8GljLbDj9xg== X-Received: by 2002:a05:600c:3e0b:b0:456:1e5a:8879 with SMTP id 5b1f17b1804b1-45892b9c21fmr66788295e9.9.1753949970938; Thu, 31 Jul 2025 01:19:30 -0700 (PDT) Received: from localhost ([87.254.0.133]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4589edf54bdsm18154945e9.6.2025.07.31.01.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Jul 2025 01:19:30 -0700 (PDT) From: Colin Ian King To: Rob Clark , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2][next][V2] Fix dereference of pointer minor before null check Date: Thu, 31 Jul 2025 09:18:53 +0100 Message-ID: <20250731081854.2120404-2-colin.i.king@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250731081854.2120404-1-colin.i.king@gmail.com> References: <20250731081854.2120404-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="utf-8" Content-Transfer-Encoding: quoted-printable Currently the pointer minor is being dereferenced before it is null checked, leading to a potential null pointer dereference issue. Fix this by dereferencing the pointer only after it has been null checked. Fixes: 4f89cf40d01e ("drm/msm: bail out late_init_minor() if it is not a GP= U device") Signed-off-by: Colin Ian King Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/msm_debugfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_de= bugfs.c index bbda865addae..da618720cf8a 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -325,13 +325,16 @@ static struct drm_info_list msm_debugfs_list[] =3D { =20 static int late_init_minor(struct drm_minor *minor) { - struct drm_device *dev =3D minor->dev; - struct msm_drm_private *priv =3D dev->dev_private; + struct drm_device *dev; + struct msm_drm_private *priv; int ret; =20 if (!minor) return 0; =20 + dev =3D minor->dev; + priv =3D dev->dev_private; + if (!priv->gpu_pdev) return 0; =20 --=20 V2: remove changes of minor->dev->dev to dev->dev, put them in 2nd patch -- 2.50.0 From nobody Sun Oct 5 18:12:40 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 B10A028D8C9; Thu, 31 Jul 2025 08:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753949975; cv=none; b=M1nLnwp/bIfpAK534wlBMs1oHpmejeM9tE9citRYqA3Wggg229i9dSU+EMZC4vzjsohazf/L+7YJ6ydCYju3Se8QHGMTOZu6EUKdPhH/+l/3nrGyZr8Xd9PN5xnr4NyR6ojSErd7vG2390CIuwKZLQLcA7E6+IbYWa3um+iZ1N0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753949975; c=relaxed/simple; bh=PxsBR5tp27NRMZoMBwZZRy3k4oipyo9hQ2NqIO1xk8I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DB7fxc9e69bqxW+biDuU2GTMRo+PZ/A85Z2EjSIlopYoU8W4dfK+9BF7QHGLK+m3Tm6mRs1nq5S8Z0i1B1UxeyIwc3u5qKC0U1xKy3yXxmRzI6BxvT+uiufqkU54ejFrmCYTX8xmXKBL4xg8FbWMCqo+Mk8Xd3Uwiw6RIfu7MFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Eem3bXSS; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Eem3bXSS" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-45622a1829eso589305e9.1; Thu, 31 Jul 2025 01:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753949972; x=1754554772; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gcoomw/1hAL3KvzlKNuykH0cI7TxLyZBhhHk2RTTvDM=; b=Eem3bXSSU1OoawncizhCfO+OQlHBMOX+0qP+9m7LnISsrLs9EGT6sZd1XHsLid6c47 5O7IYeij5GIWgNv7Vbn+LqmRGhvB+PFjiqIZKsYVppB/zaEoFoQ8XSd0RtiSykEG86tM Rb9okvX0lVDLPnYiEeOoRxp1EM884D6910COfmNTpq3lEJkPzNpgTrn4HkaYzDG4MFg2 cn6zVMZLJpAawNvXcLsu6rGbk34aAVZIcJFlIyNvSu0t2j7R6SV3Hx7VEu/XW8WM8bJR LdnSqb25Ecb69KLBxoVvAK93AdmVt/jznn9F5aX3dNffu3rEkNMJhwRwen7x9z8ZrB9J YNww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753949972; x=1754554772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gcoomw/1hAL3KvzlKNuykH0cI7TxLyZBhhHk2RTTvDM=; b=lypmPRFPh1iYMGf8HcNRCTjp5X/M7bHArdorq38C2SmtIgg7in/UcnJInjKSMro18G 6D5FL/K217UhgU4o7uvgWsYwZElk0WhgiIQeTEsB+P8MXwWkpR7ho6X7sk28s/E1GMKh MyZTSOHxi/pMugESD8eJN6Q+CVy69OLnxZweogrPj0SWbJtnJN4EDoQE9mf/FY1ij4cd DEAmKVN6G3lcoAUV4sdg1QmrS7v5jL2S1HcLpBm0gKNQ13fLKGq2AgnhgsH+vDL6itVD UEp4OBbN/g8dmUsIg4iLl6VRSa4ggitzUxMJkDTTv3hoUvp3sm2B0TS8TS7BLJSiFZ/u BQsg== X-Forwarded-Encrypted: i=1; AJvYcCU4tTi/0dM577E0Ren90gLDVL+/03mfwChnU3+XD4RXKfhQwbnqf1SYCCBq4M1wdahrKvY7vVTIyIPZ5Qf8@vger.kernel.org, AJvYcCVmXrkOIR6u0nEiYuDA1UntQDC8mQ41LmCfebrkUOBHnnNaNS8IM1xj5Vw8PW/4z65xVK4b1LKr6NF8Pzbr@vger.kernel.org X-Gm-Message-State: AOJu0YxWQ9Azhb4IZ2DxFoDMe7+N5WdcHuJiO868oB4WQfAkaBjhw0ZZ 5DBDuLS2CAcPPzsC+o4MQNxNTZcg0cTxH7rzKflJAtPpSXkuDhVKl2aVt1w9I7g/uAqnCw== X-Gm-Gg: ASbGncsFGKksmjhgJCdA4S2IZkntVtRUtwaykwvRwrq8oKpIRSDHnOowuwmTg9GhoJ6 ur/+sI8L/fQcPhoZxpOiWTqx0erlagsN745u4fBmKtJP0aL79QidIgJUdmorjMjB95+lKxVaXVh wvqqlFqMCuVetiYtgnNlbxdRSs1WF3Wc5R5T2yccs0BTXN+xVWFiCKbhpXisMeAwzvz0DjrrDYO qSKNgQTHtu/MHQcal5zuwiQwDN96eeN6nrE/VAIZEQ6CYVH4GGxMq3EZh+Kfw3EX9y3B39Y2OLj v1nsyTu5YIw2USurNjKVDIU/qU4jgs2lTROhY5svxr0UX7Wyt/sLIwRLzquuD61xCmYCv8TmwOk T8Z4LvdFcfXFg+5SuY7Za8B1Mhibshn0= X-Google-Smtp-Source: AGHT+IHNFINuB2qnm+mYjJQTsDwzlFYJuyZc8VGKOrPRokvjoYXrZDyXCOjo94KVV+XJTnQmPhaYqw== X-Received: by 2002:a05:600c:6308:b0:456:1121:3ad8 with SMTP id 5b1f17b1804b1-45892b9cfacmr65956625e9.10.1753949971926; Thu, 31 Jul 2025 01:19:31 -0700 (PDT) Received: from localhost ([87.254.0.133]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b79c3b9074sm1516092f8f.17.2025.07.31.01.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Jul 2025 01:19:31 -0700 (PDT) From: Colin Ian King To: Rob Clark , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2][next] drm/msm: replace minor->dev->dev with dev->dev Date: Thu, 31 Jul 2025 09:18:54 +0100 Message-ID: <20250731081854.2120404-3-colin.i.king@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250731081854.2120404-1-colin.i.king@gmail.com> References: <20250731081854.2120404-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="utf-8" Content-Transfer-Encoding: quoted-printable The pointer dev has been set to minor->dev, so replace minor->dev->dev with dev->dev in the DRM_DEV_ERROR messages. Signed-off-by: Colin Ian King Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/msm_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_de= bugfs.c index da618720cf8a..97dc70876442 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -340,13 +340,13 @@ static int late_init_minor(struct drm_minor *minor) =20 ret =3D msm_rd_debugfs_init(minor); if (ret) { - DRM_DEV_ERROR(minor->dev->dev, "could not install rd debugfs\n"); + DRM_DEV_ERROR(dev->dev, "could not install rd debugfs\n"); return ret; } =20 ret =3D msm_perf_debugfs_init(minor); if (ret) { - DRM_DEV_ERROR(minor->dev->dev, "could not install perf debugfs\n"); + DRM_DEV_ERROR(dev->dev, "could not install perf debugfs\n"); return ret; } =20 --=20 2.50.0