From patchwork Mon Mar 20 17:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 72346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1360950wrt; Mon, 20 Mar 2023 11:13:29 -0700 (PDT) X-Google-Smtp-Source: AK7set+cw3f4CaILl5LaONGDKA4hIcTnN/IGcTQv+mdhTG005uwLCVpGpWzEZgavDGH5kC8HlGLY X-Received: by 2002:a17:90a:56:b0:230:c41b:4d87 with SMTP id 22-20020a17090a005600b00230c41b4d87mr153559pjb.6.1679336009192; Mon, 20 Mar 2023 11:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679336009; cv=none; d=google.com; s=arc-20160816; b=AHn9I3PLavP/GnuCQ1wJEU81atHVGJ/nPyot82jB0/eHBnUTtS+cz2bdCkoHDm/x2H i3sUfPFiT/bFcb5aUi5V4FmB19gwGnoAe2JZsBEwF9aAjKvm5jUth/aLGz+lAUNzYpYc VByGXV/mb9Osc4pOQNvGF0KETW1CxJL9QjrIWB8ssHdIiutAI7UDKfyLC/U0DJYuBK0n r91UaVmeijFj4KCjQKzHyb8kPAPKROzq7NGgsD0B0/jsTYHTh0sL00fXzHzvFBJk7T4X g0R1q2MlXb5be6rFlzJrPlqUKn3dGZige8/AGtU9C05SfbJEIheJ2vHtt0uPbGb8jb28 ah7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :dkim-signature; bh=RrqTDk5Lswfr0hdos6/GnxqNwq7ga/eQN2kff/rK/xE=; b=q4UCIePp+4qSjgdnhpkJjX9VeD/mhMinw19VjYwuChREVlSjxBqN5jO9ZC4Hl2rUY4 5NcXqR1MMOIkOl4VhTWoBw39x46LWkpVVUQeRJllnwyU1sEaTmTj4ABWbgpET+YmjUM7 VJMzP8Y2KdLGci8xclCCOlO3FUyMJT43Y543wbNn+RdFCJ1jLJDeuj3IwGzn3IaFwvMC GpPqPz6A541dSXlKua+g8nlFKZZJbNcJXZeAMRaP0OjcePGnjC7t7zG36USx8XiMQjvm nsBloFMdCh4MjBBlpDnJUSEaDU2aw5tHUjobsJHipb/TlhuVQd0ge72ZOcT6qmIYgl+H sVhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=eCuJ2lAG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a6-20020a17090a854600b0023def94be71si11041588pjw.162.2023.03.20.11.13.16; Mon, 20 Mar 2023 11:13:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=eCuJ2lAG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230226AbjCTRyW (ORCPT + 99 others); Mon, 20 Mar 2023 13:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230346AbjCTRxq (ORCPT ); Mon, 20 Mar 2023 13:53:46 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C38D93D908; Mon, 20 Mar 2023 10:48:08 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 88A535FD1B; Mon, 20 Mar 2023 20:46:54 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679334414; bh=RrqTDk5Lswfr0hdos6/GnxqNwq7ga/eQN2kff/rK/xE=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=eCuJ2lAGZxL69Lqwii04IvPClHzbzFqAK/eI3CMewvovZ6ShHl895fRp1sJREuVZy fjDixRM1FnEjWCcSyibuqJN0Q2MliFkEyOl9+/zQBzrnSJWIe6gBumqaQg4dvYZnxB 1k6/QjOO20OLj/xo/lKVo+CRKr6WFqpuGFSRMvPrWVadAku/qgnXVNPdQn31ISixLj et/UsKwTXLGjzfD2Mhk4GG7NJIvf4OIljD+EGliIihGiA36Rl9zEL+kpHyYX3SFB6C ZcZyc941/r2ypSsZotGZs/Js2s5KC49PqvZRMDDwVpAnOvYlMNkgwyI95kXpqj9+pB LnLwWrCy0f1lA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Mon, 20 Mar 2023 20:46:50 +0300 (MSK) Message-ID: <08d61bef-0c11-c7f9-9266-cb2109070314@sberdevices.ru> Date: Mon, 20 Mar 2023 20:43:29 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net-next v1] virtio/vsock: check transport before skb allocation X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/20 09:56:00 #20977321 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760911434798864225?= X-GMAIL-MSGID: =?utf-8?q?1760911434798864225?= Pointer to transport could be checked before allocation of skbuff, thus there is no need to free skbuff when this pointer is NULL. Signed-off-by: Arseniy Krasnov Reviewed-by: Bobby Eshleman Reviewed-by: Stefano Garzarella Reviewed-by: Pavan Chebbi --- net/vmw_vsock/virtio_transport_common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index cda587196475..607149259e8b 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -867,6 +867,9 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t, if (le16_to_cpu(hdr->op) == VIRTIO_VSOCK_OP_RST) return 0; + if (!t) + return -ENOTCONN; + reply = virtio_transport_alloc_skb(&info, 0, le64_to_cpu(hdr->dst_cid), le32_to_cpu(hdr->dst_port), @@ -875,11 +878,6 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t, if (!reply) return -ENOMEM; - if (!t) { - kfree_skb(reply); - return -ENOTCONN; - } - return t->send_pkt(reply); }