From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E7D7C4332F for ; Mon, 6 Nov 2023 10:09:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE73A10E2A5; Mon, 6 Nov 2023 10:09:25 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F76110E2A5 for ; Mon, 6 Nov 2023 10:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699265364; x=1730801364; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=iTtdn9NTSCorllxnKuTlQUAZPiNQtDDB2OWZ4jvpSUE=; b=maKKiFqb7Y4cIOKTnuilmUz/okqpDhmPpM3T5yXP9OkAPohKD6yh9ojS CQMgJb9XjpqVDTW3bEMEJinn6XXxj4CjvPBJEiLfOBqxzo5RGPpMZgW9P H0ksWkSIEcDXaGV9OJPVrlr5mAAZ/3BYVTPrHitCXtw4kwbEwSCc0gjqw +g9pCpZZ8OmAJX6a3VU7va/3BvZbEdKrpE/Ge+GbHqUGDVw97h9gfHS2f 2eGCZNUpIbQZd5Ng/eUTu/NNo4jKFU3k/5rL8IxfLD1ajkX9gO445U7YT ormK78e+FafT3Mbw55hwX/7GGvFyipPA0yfRV78Ns6ahF20gvUmXPcsYW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10885"; a="455728350" X-IronPort-AV: E=Sophos;i="6.03,281,1694761200"; d="scan'208";a="455728350" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 02:09:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10885"; a="765905577" X-IronPort-AV: E=Sophos;i="6.03,281,1694761200"; d="scan'208";a="765905577" Received: from lpilolli-mobl.ger.corp.intel.com (HELO localhost) ([10.252.36.222]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 02:09:21 -0800 From: Jani Nikula To: "Kahola, Mika" , "Das, Nirmoy" , "intel-gfx@lists.freedesktop.org" In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20231026125636.5080-1-nirmoy.das@intel.com> Date: Mon, 06 Nov 2023 12:09:18 +0200 Message-ID: <878r7b19dd.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH v3] drm/i915/tc: Fix -Wformat-truncation in intel_tc_port_init X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Hajda, Andrzej" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 27 Oct 2023, "Kahola, Mika" wrote: >> -----Original Message----- >> From: Das, Nirmoy >> Sent: Thursday, October 26, 2023 3:57 PM >> To: intel-gfx@lists.freedesktop.org >> Cc: Das, Nirmoy ; Kahola, Mika ; Deak, Imre ; Nikula, >> Jani ; Hajda, Andrzej >> Subject: [PATCH v3] drm/i915/tc: Fix -Wformat-truncation in intel_tc_por= t_init >> >> Fix below compiler warning: >> >> intel_tc.c:1879:11: error: =E2=80=98%d=E2=80=99 directive output may be = truncated writing between 1 and 11 bytes into a region of size 3 [- >> Werror=3Dformat-truncation=3D] "%c/TC#%d", port_name(port), tc_port + 1); >> ^~ >> intel_tc.c:1878:2: note: =E2=80=98snprintf=E2=80=99 output between 7 and= 17 bytes into a destination of size 8 >> snprintf(tc->port_name, sizeof(tc->port_name), >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> "%c/TC#%d", port_name(port), tc_port + 1); >> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> >> v2: use kasprintf(Imre) >> v3: use const for port_name, and fix tc mem leak(Imre) >> >> Fixes: 3eafcddf766b ("drm/i915/tc: Move TC port fields to a new intel_tc= _port struct") >> Cc: Mika Kahola >> Cc: Imre Deak >> Cc: Jani Nikula >> Signed-off-by: Nirmoy Das >> Reviewed-by: Andrzej Hajda >> Reviewed-by: Imre Deak > > Reviewed-by: Mika Kahola Thanks for the patch and reviews, pushed to din. BR, Jani. > >> --- >> drivers/gpu/drm/i915/display/intel_tc.c | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i= 915/display/intel_tc.c >> index 37b0f8529b4f..f64d348a969e 100644 >> --- a/drivers/gpu/drm/i915/display/intel_tc.c >> +++ b/drivers/gpu/drm/i915/display/intel_tc.c >> @@ -58,7 +58,7 @@ struct intel_tc_port { >> struct delayed_work link_reset_work; >> int link_refcount; >> bool legacy_port:1; >> - char port_name[8]; >> + const char *port_name; >> enum tc_port_mode mode; >> enum tc_port_mode init_mode; >> enum phy_fia phy_fia; >> @@ -1875,8 +1875,12 @@ int intel_tc_port_init(struct intel_digital_port = *dig_port, bool is_legacy) >> else >> tc->phy_ops =3D &icl_tc_phy_ops; >> >> - snprintf(tc->port_name, sizeof(tc->port_name), >> - "%c/TC#%d", port_name(port), tc_port + 1); >> + tc->port_name =3D kasprintf(GFP_KERNEL, "%c/TC#%d", port_name(port= ), >> + tc_port + 1); >> + if (!tc->port_name) { >> + kfree(tc); >> + return -ENOMEM; >> + } >> >> mutex_init(&tc->lock); >> /* TODO: Combine the two works */ >> @@ -1897,6 +1901,7 @@ void intel_tc_port_cleanup(struct intel_digital_po= rt *dig_port) { >> intel_tc_port_suspend(dig_port); >> >> + kfree(dig_port->tc->port_name); >> kfree(dig_port->tc); >> dig_port->tc =3D NULL; >> } >> -- >> 2.42.0 > --=20 Jani Nikula, Intel