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 20616315D51; Wed, 3 Dec 2025 15:42:50 +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=1764776570; cv=none; b=V8RsgXi2p3X6vtlNaE61L6laG7r9DdaJXh/nunwE38STaYlP1wZt3iRl+e4414EpRIYP9wSFwr0T28E4k3mRDIAIuWv0QXTYlVctyUgdM2Wy0/zwTSWWEq26McOU/3VAEWsFaNLa9ussw9eN98zEDwd1g1tfnLTg3KQBMjokOGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764776570; c=relaxed/simple; bh=i60slNYl/39H+n7gX74aDvl0trY4EYXVyOUJO+p1zd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=leEvRb0GIGuc5ETzEtb3P0lx7drSceTz2GmjUuS6ozeL4QFkrOTjoEd3xHEWDWXPujLlxkQBYm+jI+qQVKVj30FEC2uFxRLvcbO5+BBnoai8Qvq3pYME6mxTkjLuXIXZbxMVePTHUp8bGD4EMIxiHu0ujnCOsFO8GthMzN6MWzY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DzCHYMeU; 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="DzCHYMeU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D945C4CEF5; Wed, 3 Dec 2025 15:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764776570; bh=i60slNYl/39H+n7gX74aDvl0trY4EYXVyOUJO+p1zd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DzCHYMeUYDVaopl2AgSYdNPayrA33ms8fEEBwFRVMkN5JeAjHT/ul0wD1qU0m4fah 8bQBIrAesWnDmFSBHeqNqKckbK328MVxgeLhdgfxnOhJXgqU9bVtW+my67HfLm8V1Z E8RiHt1qzQuQKjyq4hzFretTdBxOH4jfnIeU7/QI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Masami Ichikawa , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 205/300] HID: hid-ntrig: Prevent memory leak in ntrig_report_version() Date: Wed, 3 Dec 2025 16:26:49 +0100 Message-ID: <20251203152408.218237892@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152400.447697997@linuxfoundation.org> References: <20251203152400.447697997@linuxfoundation.org> User-Agent: quilt/0.69 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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Ichikawa [ Upstream commit 53f731f5bba0cf03b751ccceb98b82fadc9ccd1e ] Use a scope-based cleanup helper for the buffer allocated with kmalloc() in ntrig_report_version() to simplify the cleanup logic and prevent memory leaks (specifically the !hid_is_usb()-case one). [jkosina@suse.com: elaborate on the actual existing leak] Fixes: 185c926283da ("HID: hid-ntrig: fix unable to handle page fault in ntrig_report_version()") Signed-off-by: Masami Ichikawa Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-ntrig.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index a1128c5315fff..3c41f6841f775 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -142,13 +142,13 @@ static void ntrig_report_version(struct hid_device *hdev) int ret; char buf[20]; struct usb_device *usb_dev = hid_to_usb_dev(hdev); - unsigned char *data = kmalloc(8, GFP_KERNEL); + unsigned char *data __free(kfree) = kmalloc(8, GFP_KERNEL); if (!hid_is_usb(hdev)) return; if (!data) - goto err_free; + return; ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0), USB_REQ_CLEAR_FEATURE, @@ -163,9 +163,6 @@ static void ntrig_report_version(struct hid_device *hdev) hid_info(hdev, "Firmware version: %s (%02x%02x %02x%02x)\n", buf, data[2], data[3], data[4], data[5]); } - -err_free: - kfree(data); } static ssize_t show_phys_width(struct device *dev, -- 2.51.0