From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27E3E13F434; Thu, 13 Feb 2025 15:03:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739458992; cv=none; b=rCk4xaq9+XawG5HVm6MWuYjDC+zq+ZmZpblYjMU6zbbRriVF0vuMNMUdzZT6awfiNQOeymaw8M95ZzP9zVZ1lsrv/EJHDV0AdgPbFvwjvX9yYwmuUXYYJ+I5Ap6hSEs7CsqiRbfBQgSPkYezQmdvsxo3fepeAAzyVAFw1nLPXCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739458992; c=relaxed/simple; bh=r9ZDRJR2slSXYhtr0GjWIyXK3fVgNz5/Wki5SwNZIso=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QzD2vHV+Gpi5N/kLynTTUfocY/l6rjynHZLxwT70Al5MPGQIjZZvmSI444bYci4TpYbqXfPeE3MSqzv/7E8de/EWj+9eJyZW+kJO1xQG8VsI4QVtk6Tk+Kgx4NV6OVSnKVbwaC26TScVSnzPUr+3z7pop79i1GIvr0Tl+1g8he0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C4OASUGA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="C4OASUGA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88A1EC4CED1; Thu, 13 Feb 2025 15:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739458992; bh=r9ZDRJR2slSXYhtr0GjWIyXK3fVgNz5/Wki5SwNZIso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C4OASUGAQYvmQDIP/ezGnpxql1XY5GEx/SDrmotlWTqAx/93MW2JdYE5pufjFstp3 Dk++yAgH8XHvm7tZ3IouvpaRY8JeEeU2cggV44AbX2MIiMnPIEGekQ+LHenO+Ua2BE yZ+j3B80YOCbpN3QvxqkCnTyUrFJfVLHxUm0q/C4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede , Andy Shevchenko Subject: [PATCH 6.13 104/443] platform/x86: serdev_helpers: Check for serial_ctrl_uid == NULL Date: Thu, 13 Feb 2025 15:24:29 +0100 Message-ID: <20250213142444.624658481@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142440.609878115@linuxfoundation.org> References: <20250213142440.609878115@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit 478b00a623d6c8ae23a1be7bcc96cb5497045cef upstream. dell_uart_bl_pdev_probe() calls get_serdev_controller() with the serial_ctrl_uid parameter set to NULL. In case of errors this NULL parameter then gets passed to pr_err() as argument matching a "%s" conversion specification. This leads to compiler warnings when building with "make W=1". Check serial_ctrl_uid before passing it to pr_err() to avoid these. Fixes: dc5afd720f84 ("platform/x86: Add new get_serdev_controller() helper") Cc: stable@vger.kernel.org Suggested-by: Ilpo Järvinen Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20241204204227.95757-4-hdegoede@redhat.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/serdev_helpers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/platform/x86/serdev_helpers.h +++ b/drivers/platform/x86/serdev_helpers.h @@ -35,7 +35,7 @@ get_serdev_controller(const char *serial ctrl_adev = acpi_dev_get_first_match_dev(serial_ctrl_hid, serial_ctrl_uid, -1); if (!ctrl_adev) { pr_err("error could not get %s/%s serial-ctrl adev\n", - serial_ctrl_hid, serial_ctrl_uid); + serial_ctrl_hid, serial_ctrl_uid ?: "*"); return ERR_PTR(-ENODEV); } @@ -43,7 +43,7 @@ get_serdev_controller(const char *serial ctrl_dev = get_device(acpi_get_first_physical_node(ctrl_adev)); if (!ctrl_dev) { pr_err("error could not get %s/%s serial-ctrl physical node\n", - serial_ctrl_hid, serial_ctrl_uid); + serial_ctrl_hid, serial_ctrl_uid ?: "*"); ctrl_dev = ERR_PTR(-ENODEV); goto put_ctrl_adev; }