From patchwork Fri Mar 17 10:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 71240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp265647wrt; Fri, 17 Mar 2023 03:51:57 -0700 (PDT) X-Google-Smtp-Source: AK7set98N7C7GDrks+QjtPyxA3kNTL53KdIGMvO5ASpAwc3mtD/6TJkZW3rgxIzppt0ZJ9Xjc/p3 X-Received: by 2002:a05:6a20:441f:b0:d4:faa7:be92 with SMTP id ce31-20020a056a20441f00b000d4faa7be92mr12177635pzb.6.1679050316751; Fri, 17 Mar 2023 03:51:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679050316; cv=none; d=google.com; s=arc-20160816; b=IkMe5TCCm2OaSZbO+KfCBGgdlpT8UPDtefpFTeo97HWEqnG17mNvALkNdKpqx+laJ4 fHt2TclYWD4D0G4zYptS2FV8xTUR+BVO+dyqWkFcAhCSeeWtRmeJni8IR9L7hvBPQCKi uOB4wNgQWdqKlCUcToe+qd5P2eiVJoKywgNKxBjfOHZS4FwOIJFDBu91nPXVNW9A6ZlX eLVfyqVQl4oo5n8CTrzppSnayjV26El8zPxnoxb14Gx5Q+rSBqUQ1sYvU2wGYMN+HGya AVF1ZIRKfWDQDsj1TcyyWjgHcIkLXtU/RfR+kP9bGqHCdIAvYOxnYFcbe4xSK5rOF/f6 9mng== 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=rd/dOTnDe+BcqbCPdIvmhuxmSpptLS9RYhwrV6xtdsI=; b=etT5Cyy5fqHro1lKwKo9LeS0mu8yG10K5/s7UdqKjVXPaZTaHKXQjUBBUrY8K9dSg4 20VG2e57S5BBnVhvwQFsJ7vJyolvMgv2MBTG0Bett32EHT6AOaFY1hpX7M/hOzqJz9XX GWld9WOOmKXIU4uSvcX4MTnWDM/5gruQShInkwghXTW8NNh4HALRTye49e0+zjRTYSPO utqjqqNsuC3ifdcWQRkHJB0WerJWh3m46J7kRCy+MVjkyKqu5lnovy8rgPNXuJ9WDEjd +bXxUlfeXBPZzvMKdjzTgxF2F992ThhWPewLq1d5QLTiTMtGoKazKtpOYBB67z0mWmk7 KyAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=daR9AoWK; 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 z4-20020a655a44000000b00508bf5974fdsi2123863pgs.237.2023.03.17.03.51.43; Fri, 17 Mar 2023 03:51:56 -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=daR9AoWK; 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 S229991AbjCQKki (ORCPT + 99 others); Fri, 17 Mar 2023 06:40:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbjCQKkf (ORCPT ); Fri, 17 Mar 2023 06:40:35 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F92132E7B; Fri, 17 Mar 2023 03:40:33 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id E18055FD3D; Fri, 17 Mar 2023 13:40:29 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679049629; bh=rd/dOTnDe+BcqbCPdIvmhuxmSpptLS9RYhwrV6xtdsI=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=daR9AoWKhqByDghg86PjTmKX1KagfMHR3VqrJy5ySSPeiDqkLs3vWTHUwuqJzbLUX NarHbA5ZZlYgiCFMJzY6R1r5K9wXxB0DdMAv416ndoRqLG/0JUGO/cGhJA26eIwV6X +NmSYO0MNhYxcdJFfe904ZJvrZlHMRnS7Gr06zkppj9MLNgSxp/TQHQA6ehBp+jBFt 5PaaCWqzWIZrFJBA1NsR2hSvCPbpYInlt8yRiV3eh0HlYUs67aHomKBAP0l686dnRJ EYPVb61Suj1chezYG9zK8M6+xNZD9UmVart5OuEdj/3lWOGUFvwj1DREtLICKpMX+2 t95I4Eb+ZIjoQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Fri, 17 Mar 2023 13:40:26 +0300 (MSK) Message-ID: <47a7dbf6-1c63-3338-5102-122766e6378d@sberdevices.ru> Date: Fri, 17 Mar 2023 13:37:10 +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: [RFC PATCH 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/17 09:15:00 #20959649 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, URIBL_BLOCKED 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?1760611864581104495?= X-GMAIL-MSGID: =?utf-8?q?1760611864581104495?= 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 --- 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); }