From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 98F0E481226 for ; Fri, 7 Aug 2026 13:17:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786108637; cv=none; b=LSOEZ73WDKcEMdS2mTKMEJNG5DVAEYdF/LkPtBjLKWlLz/dV/M2Tnrlm+JseLPb2+yppi5YHLKA/Ff88GMfnZSnAjyp7idc8lESChuVAk+ZurtqYClTx6+SaHwVhTDxh8xY65xEZ0OwHANjvK/VKMB12LtDinux5mwobM5r7Lx0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786108637; c=relaxed/simple; bh=dKOgLjoQDXNhftfcH1BbDNU8KjD8R9UfFEPr4W0zOdM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fePE2jsgdizVEtHR9LEcRFeSiK/iCGLarHitNAtWso1HDQjvtKRg11j4eymdIpoI3JG8/ntTUJVlx19i7QMr5X9ANYfAC396zJNVfe755pJVINLtyXH6+1QrfEeEsNRpL+niQDVujX78sjv/62l+QvdHnbQNGAwYVth3g3kWEG4= 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=aouCJ8yk; arc=none smtp.client-ip=209.85.214.178 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="aouCJ8yk" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ccf2360620so32688935ad.3 for ; Fri, 07 Aug 2026 06:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786108628; x=1786713428; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BfAP8cKuZR4B3rvqlJpAg0XbUtRyqZDyaASjiD5GIjI=; b=aouCJ8ykZ/pjfPyDbmqtlBIOTUIl4F+Kq4NpZe4l0EUoRof/ygI+2i6SQYSPnTy6C7 hI7BP9fEEhf6rX4wyoo+fppUjKA0t1QMoH0lQiTn5kLRbEhGWszGYr9Fu6iTZlzDz1iz FRWytEQjX5Ru0NBB4/4UDNsf3zlKt4YOq+XS2bRFj2tHlDUE+H5kDfxlnDt786S7CqOp xhpgOeZDAvOpmVWRDLdWp3oEJ9LFSpw9TXN/vzeUaU8GlRlFSZcnHVjzOmRJtJPMSSNK Xpg4QuJ/x1zDJu/it6qSXz/bvDBWG455SZU3hOEFEcip8qE7AWX1G4zwRk5zXVWn1ozx +3Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786108628; x=1786713428; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=BfAP8cKuZR4B3rvqlJpAg0XbUtRyqZDyaASjiD5GIjI=; b=IpOV4wUUlNnXfbKJctmpzIFxBWgqDysmLmjMXLBohGubcRFH82y5e7/5VyYkhp8Vwn e2XMEizpH2uPvTvuGg9a9A2w+5wak9gJKf3E2whh0Ppoi241GgElB4LVvkfl3wV2Npoc B7R/fasp6UlQ96gktGPMr3In3C+ZevI+cQ7pGzuG9H49J6uuGYqfCXzxORyHVbGWzdSP 3P8zm1Jp5JkEKdBLdXrZLGP4l0HFSUyrKHmdcSMCSC317U4oHyF4eCq9r6IoD/KqfRMB ZNb/b8lLZjYZKUJA/oJk5zbz6lCXKsk8XnyPdwm/Z2JRnNfcjdqenRivf+fJ3C+qyBiS gcIw== X-Forwarded-Encrypted: i=1; AHgh+RozW6ny7TmLR6uriKoZJSshQ3DceB4BLk/UDKPTjYUYuRtMbX+EcRwq5qBpws8L+cBPjsptSJXJ+k1e+Kg=@vger.kernel.org X-Gm-Message-State: AOJu0YxqYvKsytVhLgeRpwaajOlxnrKDdWs+P7Lsal6BhwoERDbvHT8Z VRZrak9kki2/4L1bxn+VKoO7SEUak15uPZCyN8bODSebZJwHoBqDJoTP X-Gm-Gg: AR+sD10Aaxej3rq+pGSTYc/9zPbMrwgg3GA0DINj8IzQgLuYgPby4a/8Kkc2poKu1Sj aT9bd7Q7H8Y/lSXLcrgH7221WVA6Wo9Z5G1zmIxMb3H+bmKX6vF4btXuUtnUFu+gOT1tKemCayc L6ZL66fgE3+sz1RdTyrSWQD4L7THnsydRXom5h95lRs45DcCuPEHY7uBVsIkG5BPT7suIsYV0qw nI1bgOpJK7txoN0WvuRN67PQNfQNrWU7Xyd/XM43Sm65R5yqFIqMqOSMT+rE2xqXvxj60QCKXsL 9x9YdkOAnj89ZOEWqua+FfvNwl/nf0Mgp9JJjYEPr2tIL2dTqHpsMdvNIrhzxlDz8buPOdq1d6n hQmPzfkScdrjPVnEjLLXM/A6lS95SdbOxZoEPy/MadDLaMzZt5xBWV3yxIx7VJClN/iFUy1qFlE M08ybb39GwyLATiXjQzMul+eFs/5YtzZmJRPPl+CyogQAPIkzI7Nh24GCAEMDcxyyqfjHKl0eYV i5t8RbOHctnlkj3HxJt9BbBJ16F1jc1HICkFO/xSCNsXELuFNaNytQmLJ85BsvudKw= X-Received: by 2002:a17:90b:448b:b0:38e:524:8797 with SMTP id 98e67ed59e1d1-3909d8c3b9cmr7639183a91.13.1786108627692; Fri, 07 Aug 2026 06:17:07 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.166.246.74]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-390b33225e0sm1300528a91.4.2026.08.07.06.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 06:17:07 -0700 (PDT) From: Felix Gu Date: Fri, 07 Aug 2026 21:17:00 +0800 Subject: [PATCH v2 2/2] phy: sunplus: fix ERR_PTR deref in update_disc_vol() 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: 7bit Message-Id: <20260807-sunplus-v2-2-d5379c664dfc@gmail.com> References: <20260807-sunplus-v2-0-d5379c664dfc@gmail.com> In-Reply-To: <20260807-sunplus-v2-0-d5379c664dfc@gmail.com> To: Vincent Shih , Vinod Koul , Neil Armstrong Cc: linux-usb@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786108621; l=1342; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=dKOgLjoQDXNhftfcH1BbDNU8KjD8R9UfFEPr4W0zOdM=; b=XBMnxzzMFA7SxO0AkVbnFqri4xCE1jOMRHEQdUYqX6RZqQU+oFWuyefKAeVSfc9S3M4rbY/nm wkUvtimBuQVBDj4COof942kze7rLaEyomEOFGHbiBNVszcYb4FlAZOZ X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= nvmem_cell_get() returns ERR_PTR on failure. For any error other than -EPROBE_DEFER the code fell through and passed the invalid pointer to nvmem_cell_read(), which dereferences it. Skip the read and write the default disconnect voltage when the lookup fails. Fixes: 99d9ccd97385 ("phy: usb: Add USB2.0 phy driver for Sunplus SP7021") Signed-off-by: Felix Gu --- drivers/phy/sunplus/phy-sunplus-usb2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/phy/sunplus/phy-sunplus-usb2.c b/drivers/phy/sunplus/phy-sunplus-usb2.c index 842087bdfba5..eb834788ea2f 100644 --- a/drivers/phy/sunplus/phy-sunplus-usb2.c +++ b/drivers/phy/sunplus/phy-sunplus-usb2.c @@ -84,9 +84,10 @@ static int update_disc_vol(struct sp_usbphy *usbphy) u32 val, set = OTP_DISC_LEVEL_DEFAULT; cell = nvmem_cell_get(usbphy->dev, disc_name); - if (IS_ERR_OR_NULL(cell)) { + if (IS_ERR(cell)) { if (PTR_ERR(cell) == -EPROBE_DEFER) return -EPROBE_DEFER; + goto skip_nvmem_read; } otp_v = nvmem_cell_read(cell, &otp_l); @@ -101,6 +102,7 @@ static int update_disc_vol(struct sp_usbphy *usbphy) kfree(otp_v); } +skip_nvmem_read: val = readl(usbphy->phy_regs + CONFIG7); val = (val & ~J_DISC) | set; writel(val, usbphy->phy_regs + CONFIG7); -- 2.43.0