From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 0025E370AF3 for ; Tue, 23 Jun 2026 10:14:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782209699; cv=none; b=eDgDvZvH0d0yBAKMRgIp1nceIxJgg1AWhokEidUf9+FaS7/Sq7xiKGuU5bKJ+VLpKdiQYqVfsyka6sY0kU770Xfa5Q3tJFlVJ+tnr27oBqKTVxvk1nrFI/oKGsmI+J097X+ABeyV4BjulTd4Jz7DpGZGpbT3ozaO0AKNGrkaQP0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782209699; c=relaxed/simple; bh=BonxlASbrudEWQ9VqkFxYPYzf3PGM/pEI5og4/ogyA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GurkUJYA1A+L7wgFE3AvPEN8OmB5kaqn+hrkKz21pL2D27L/xA8fOfidsFXd084lnWryNGUvzTmcy/XAHvSSXXMI103Xsi0EO1gfLG6OnkWR8LlzMj2RdosFcjABBjgGKRCC6q9o/3BTQ+bDILinOYh/aNugphz0jluPCnLCbNU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BFQEXPIK; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BFQEXPIK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782209697; x=1813745697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BonxlASbrudEWQ9VqkFxYPYzf3PGM/pEI5og4/ogyA0=; b=BFQEXPIKDNMLYWjZyRJKs5ICmhzHd6uS22bYkJe8d4WewbvmW4lWJr6m Ng9hECeD0/345ktjzSeNYFtsOEjk8M82zP+loCsuJ/b2cQM0/nG8Y4mER aBPz/gjlJR38q9kYb70vlA5M+cM8L8G2eZSIt2lL9s3oI+d3ArXFDQSw7 9c4xF+YbVV8MPPjYgQ1abuOLTJ9JA4KqH1q1Hc+5ASh04abVIHwf0nUyT qaqfuZLTS5g2sY4ojTRdCORMEGaFKF1v0axo2dKNE5LAlfS2c169ij5co D72YASpY5dRrZuUFYRdP+DFLlKJ0AMasEWTREKtuEUjW7xTvsX0Jtgjnp A==; X-CSE-ConnectionGUID: jrcuXw9DSJe87BM1R2alNA== X-CSE-MsgGUID: hPWddi5jTOqFLy5lDYB5hA== X-IronPort-AV: E=McAfee;i="6800,10657,11825"; a="82053153" X-IronPort-AV: E=Sophos;i="6.24,220,1774335600"; d="scan'208";a="82053153" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2026 03:14:57 -0700 X-CSE-ConnectionGUID: 4zY4OzmoQ8WEkjOAZrRidw== X-CSE-MsgGUID: S/1q8ipaR2+FJbwt5KHINQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,220,1774335600"; d="scan'208";a="273175472" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by fmviesa002.fm.intel.com with ESMTP; 23 Jun 2026 03:14:52 -0700 From: Raag Jadav To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org Cc: simona.vetter@ffwll.ch, airlied@gmail.com, kuba@kernel.org, lijo.lazar@amd.com, Hawking.Zhang@amd.com, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, dev@lankhorst.se, zachary.mckevitt@oss.qualcomm.com, rodrigo.vivi@intel.com, riana.tauro@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, mallesh.koujalagi@intel.com, Raag Jadav Subject: [PATCH v4 1/5] drm/ras: Cancel and free message on get counter failure Date: Tue, 23 Jun 2026 15:39:55 +0530 Message-ID: <20260623101043.255897-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260623101043.255897-1-raag.jadav@intel.com> References: <20260623101043.255897-1-raag.jadav@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit doit_reply_value() directly returns on get counter failure, which results in stale sk_buff and genetlink header that aren't cleaned up. Fix it and while at it, consolidate error handling using goto. Fixes: c36218dc49f5 ("drm/ras: Introduce the DRM RAS infrastructure over generic netlink") Signed-off-by: Raag Jadav Reviewed-by: Riana Tauro --- v2: Use goto (Riana) --- drivers/gpu/drm/drm_ras.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_ras.c b/drivers/gpu/drm/drm_ras.c index d6eab29a1394..467a169026fc 100644 --- a/drivers/gpu/drm/drm_ras.c +++ b/drivers/gpu/drm/drm_ras.c @@ -201,25 +201,28 @@ static int doit_reply_value(struct genl_info *info, u32 node_id, hdr = genlmsg_iput(msg, info); if (!hdr) { - nlmsg_free(msg); - return -EMSGSIZE; + ret = -EMSGSIZE; + goto free_msg; } ret = get_node_error_counter(node_id, error_id, &error_name, &value); if (ret) - return ret; + goto cancel_msg; ret = msg_reply_value(msg, error_id, error_name, value); - if (ret) { - genlmsg_cancel(msg, hdr); - nlmsg_free(msg); - return ret; - } + if (ret) + goto cancel_msg; genlmsg_end(msg, hdr); return genlmsg_reply(msg, info); + +cancel_msg: + genlmsg_cancel(msg, hdr); +free_msg: + nlmsg_free(msg); + return ret; } /** -- 2.43.0