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 C6A6923026D; Mon, 10 Mar 2025 17:39:17 +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=1741628357; cv=none; b=SfOGCoXGN53owKp9kbnp1QShWXmOvDbjoO1C6fDlak1kESUQrGcwn2BmbI9BKy/KYuVXm5L2nxYGFrd44fGoql/Ye0nhKepcGoV2fRKM0pFpXb0G5aTuq+w12r975fITrX13JHMEZWqoMQE89hv7zOzknINgxLWmomwTaP9iInY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628357; c=relaxed/simple; bh=pWUdkgJrh5lolVltlIbQXIEb9TJPqsGD0orOAlvA+dQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i3/zbR0bDzd2xzuGlrJmNs6TXKowfr58wgKirFUc0U8JUfNqH4ILjz4sIS3DBiHMa9NB+qlpsTiS84fjp9VdSiZOEDAByocqo0vWNp/rX3RWjYkYj1AjUNkmSJh7AU2xzNG4EAknEGWzRbdZcZ3HTUzdeqDxcOJb066+ciYyzTc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GbD6tb1c; 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="GbD6tb1c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EB78C4CEE5; Mon, 10 Mar 2025 17:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628357; bh=pWUdkgJrh5lolVltlIbQXIEb9TJPqsGD0orOAlvA+dQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GbD6tb1cf3HntGXfYWhhk9+TxY+iFFbz/b+yKwQPfEBJY3EfITJgF/CAfu7/x1qKP 9fg5zFbYveExuNVVlWRGyVsbCkcqkrEtp+QUhghIszkXZS6ZF/xKKCA2BD46+BZnEE oFq+5lQ3/XbgmU82+qyhXW1g/LPs485KHYtLYHJ0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Dan Carpenter , Alexandre Bounine , Matt Porter , Yang Yingliang , Andrew Morton Subject: [PATCH 6.1 031/109] rapidio: fix an API misues when rio_add_net() fails Date: Mon, 10 Mar 2025 18:06:15 +0100 Message-ID: <20250310170428.796642806@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170427.529761261@linuxfoundation.org> References: <20250310170427.529761261@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit b2ef51c74b0171fde7eb69b6152d3d2f743ef269 upstream. rio_add_net() calls device_register() and fails when device_register() fails. Thus, put_device() should be used rather than kfree(). Add "mport->net = NULL;" to avoid a use after free issue. Link: https://lkml.kernel.org/r/20250227073409.3696854-1-haoxiang_li2024@163.com Fixes: e8de370188d0 ("rapidio: add mport char device driver") Signed-off-by: Haoxiang Li Reviewed-by: Dan Carpenter Cc: Alexandre Bounine Cc: Matt Porter Cc: Yang Yingliang Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/rapidio/devices/rio_mport_cdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -1740,7 +1740,8 @@ static int rio_mport_add_riodev(struct m err = rio_add_net(net); if (err) { rmcd_debug(RDEV, "failed to register net, err=%d", err); - kfree(net); + put_device(&net->dev); + mport->net = NULL; goto cleanup; } }