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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7871C4167B for ; Tue, 7 Nov 2023 23:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344231AbjKGXWo (ORCPT ); Tue, 7 Nov 2023 18:22:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235249AbjKGXWk (ORCPT ); Tue, 7 Nov 2023 18:22:40 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D66FAD79; Tue, 7 Nov 2023 15:22:38 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97962C433C7; Tue, 7 Nov 2023 23:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699399358; bh=5aSZH5wA6ryFjcHVYhyKB+UrEDRCSQpwhWEc+VLnw3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k653T4fGNRynBicjyfYrUeOpXHpsnRzIgavbo0w3+38r4oAVzVXBAgmMSMM6q+fx7 +o8ooOkbivz1N+96hU1yHFHEKkQ2An+AvbKVuTvWcf5jjjnKhDMrETsn3rEEhVO/Pm z2R7DvYxkT95R5fcar2un5btWuOlbe5zjS39B8LX9gF9f8pK2fnLAKMzKZuLIf2WTT u56tY3eCJaPgYsXk/3a3Jm/PtT7wYEchxnoo7JEErWgqFnDTpz9NW8cO/+Ipkx+8tf EmNn1UMgK8zc2ZMrqvXWqNPpiSbRJtjG70vd3mYTAXHT+rdgbWSg/qOMG9g6G1rwcj eBhIhg0hn404w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yi Yang , Jiri Slaby , Greg Kroah-Hartman , Sasha Levin , davem@davemloft.net, sparclinux@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 03/18] tty: vcc: Add check for kstrdup() in vcc_probe() Date: Tue, 7 Nov 2023 18:21:57 -0500 Message-ID: <20231107232231.3775605-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107232231.3775605-1-sashal@kernel.org> References: <20231107232231.3775605-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yi Yang [ Upstream commit d81ffb87aaa75f842cd7aa57091810353755b3e6 ] Add check for the return value of kstrdup() and return the error, if it fails in order to avoid NULL pointer dereference. Signed-off-by: Yi Yang Reviewed-by: Jiri Slaby Link: https://lore.kernel.org/r/20230904035220.48164-1-yiyang13@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/vcc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c index a39ed981bfd3e..5b625f20233b4 100644 --- a/drivers/tty/vcc.c +++ b/drivers/tty/vcc.c @@ -579,18 +579,22 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) return -ENOMEM; name = kstrdup(dev_name(&vdev->dev), GFP_KERNEL); + if (!name) { + rv = -ENOMEM; + goto free_port; + } rv = vio_driver_init(&port->vio, vdev, VDEV_CONSOLE_CON, vcc_versions, ARRAY_SIZE(vcc_versions), NULL, name); if (rv) - goto free_port; + goto free_name; port->vio.debug = vcc_dbg_vio; vcc_ldc_cfg.debug = vcc_dbg_ldc; rv = vio_ldc_alloc(&port->vio, &vcc_ldc_cfg, port); if (rv) - goto free_port; + goto free_name; spin_lock_init(&port->lock); @@ -624,6 +628,11 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) goto unreg_tty; } port->domain = kstrdup(domain, GFP_KERNEL); + if (!port->domain) { + rv = -ENOMEM; + goto unreg_tty; + } + mdesc_release(hp); @@ -653,8 +662,9 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) vcc_table_remove(port->index); free_ldc: vio_ldc_free(&port->vio); -free_port: +free_name: kfree(name); +free_port: kfree(port); return rv; -- 2.42.0