From nobody Mon Feb 9 11:45:05 2026 Received: from mail-m49197.qiye.163.com (mail-m49197.qiye.163.com [45.254.49.197]) (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 C85361CD2C for ; Tue, 30 Dec 2025 03:45:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767066357; cv=none; b=J6TgPhAtTBqBDUGazjg/KoHeyXUel7VqES0PCjJdibBbYsAwwv7n6M/UXtWU9qtnMqBwoDG3vgcKTg1xu8S+KTNHOnB/l8MU7Yno3Yan1WCT0YKyFBzl/p++RAKh3GKHRCP0YC5AqDysJqvP12YF6NpOtJwwh3cPCf4F5x3pRAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767066357; c=relaxed/simple; bh=PXnt5qd0won6lAUSky0qa3WDji9okP2EBjbM/3xjj3w=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FAtabT5d+AmmUP80Y6oL4tBRmRcERCil3E2u6YAlqQ9oB2BpAOHS9gR32rwA09O9WA3ib3/iOi4LktQI97bU4bGd4ZCZ7I07qoQ6rpkkjeuDEp1glpGTscfyOUMOGbIyWin4y2GUUXQ9y3QQJvm9IKXnHMHctiw8FZIc59fsLLs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=seu.edu.cn; spf=pass smtp.mailfrom=seu.edu.cn; dkim=pass (1024-bit key) header.d=seu.edu.cn header.i=@seu.edu.cn header.b=CXAfeADs; arc=none smtp.client-ip=45.254.49.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=seu.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=seu.edu.cn Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=seu.edu.cn header.i=@seu.edu.cn header.b="CXAfeADs" Received: from LAPTOP-N070L597.localdomain (unknown [222.191.246.242]) by smtp.qiye.163.com (Hmail) with ESMTP id 2ef8c6bae; Tue, 30 Dec 2025 11:45:50 +0800 (GMT+08:00) From: Zilin Guan To: dpenkler@gmail.com Cc: gregkh@linuxfoundation.org, matchstick@neverthere.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, Zilin Guan , Jianhao Xu Subject: [PATCH v3] gpib: Fix memory leak in ni_usb_init() Date: Tue, 30 Dec 2025 03:45:46 +0000 Message-Id: <20251230034546.929452-1-zilin@seu.edu.cn> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-HM-Tid: 0a9b6d5cb30303a1kunm3f05cef71454a9 X-HM-MType: 10 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWS1ZQUlXWQ8JGhUIEh9ZQVlDSkhLVh1KTU0dTU9KHUNCSVYeHw5VEwETFhoSFy QUDg9ZV1kYEgtZQVlJSUlVSkJKVUlPTVVJT0lZV1kWGg8SFR0UWUFZT0tIVUpLSUhOQ0NVSktLVU tZBg++ DKIM-Signature: a=rsa-sha256; b=CXAfeADswolmoTWrZhYkNwr+Z+yIY8DQJNJ6ykflTiMFwcnD328DC7k8wlMKdPWJU5EBne7nmASvoMw/0UIq5tOFTKkXsyL3lcXC8cEJMgDm3mE6Nd57B986b/TTb3pDypZK8Y1DpDd9pE5/nrJFg1I9LxOp2vDPppoplvPrBe4=; s=default; c=relaxed/relaxed; d=seu.edu.cn; v=1; bh=Kt7iTjhwskhLQWbWRj8F9IJpVWk094ipz3T5hugsyaY=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" In ni_usb_init(), if ni_usb_setup_init() fails, the function returns -EFAULT without freeing the allocated writes buffer, leading to a memory leak. Additionally, ni_usb_setup_init() returns 0 on failure, which causes ni_usb_init() to return -EFAULT, an inappropriate error code for this situation. Fix the leak by freeing writes in the error path. Modify ni_usb_setup_init() to return -EINVAL on failure and propagate this error code in ni_usb_init(). Fixes: 4e127de14fa7 ("staging: gpib: Add National Instruments USB GPIB driv= er") Suggested-by: Greg KH Suggested-by: Dave Penkler Co-developed-by: Jianhao Xu Signed-off-by: Jianhao Xu Signed-off-by: Zilin Guan --- Changes in v3: - Enable ni_usb_setup_init() to return negative error codes on failure. - Remove "staging" prefix based on current file path. Changes in v2: - Use early return to simplify error handling logic. drivers/gpib/ni_usb/ni_usb_gpib.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_usb/ni_usb= _gpib.c index 1f8412de9fa3..52fb76b48467 100644 --- a/drivers/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/gpib/ni_usb/ni_usb_gpib.c @@ -1780,7 +1780,7 @@ static int ni_usb_setup_init(struct gpib_board *board= , struct ni_usb_register *w i++; if (i > NUM_INIT_WRITES) { dev_err(&usb_dev->dev, "bug!, buffer overrun, i=3D%i\n", i); - return 0; + return -EINVAL; } return i; } @@ -1799,10 +1799,12 @@ static int ni_usb_init(struct gpib_board *board) return -ENOMEM; =20 writes_len =3D ni_usb_setup_init(board, writes); - if (writes_len) - retval =3D ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta); - else - return -EFAULT; + if (writes_len < 0) { + kfree(writes); + return writes_len; + } + + retval =3D ni_usb_write_registers(ni_priv, writes, writes_len, &ibsta); kfree(writes); if (retval) { dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); --=20 2.34.1