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 X-Spam-Level: X-Spam-Status: No, score=-16.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D3CBC43381 for ; Mon, 8 Feb 2021 18:35:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FC8B64EBD for ; Mon, 8 Feb 2021 18:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235799AbhBHSf0 (ORCPT ); Mon, 8 Feb 2021 13:35:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55731 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235632AbhBHSd7 (ORCPT ); Mon, 8 Feb 2021 13:33:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612809153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FONHI2TN+O9acLzuem6EKO8Yxg/GTLtQhMLyetszZzg=; b=NJaMKdxdXgV17Ssve+rmiCf83yKIIMWBeSWXFjNl+SOq9tFjUkxRTryqIEX/WGY4BQol7u L50UnHW07y71VLzqIJX+KYJUUlaJCjkR3oGRbE2GpQl462TJfiYBko5utGJVmNm7CMfGV4 ccyXIQUIk8QKpuBLULGtxvFqxtG5yuM= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-vt3sh3FzOSCA1OdzJT2s4w-1; Mon, 08 Feb 2021 13:32:31 -0500 X-MC-Unique: vt3sh3FzOSCA1OdzJT2s4w-1 Received: by mail-ej1-f71.google.com with SMTP id yc4so12741273ejb.2 for ; Mon, 08 Feb 2021 10:32:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=FONHI2TN+O9acLzuem6EKO8Yxg/GTLtQhMLyetszZzg=; b=Uqo7S40XqlFvGDVSmqPIQh5dLMGq4uqKCbOj9u/CnVRzAWblAzBAqqob5vvur+onFv 7p2hl/tSWU5pEr2nVeOOC5DZBhpPQZFBT60a1bwCFsSNNsBeq5JK9SUjNgpro6rHBtS4 bMX5aitPou9PW4zym/SZniGCgBaemtZ+GJYdRojK9PEwFBIsCExoGZHZ3gwh729baO9s JjGhA7qe3OHvuHRE7pEqfhDqsym20OkMwuQoBLSY/tK+R9xQDjawy+m2QsLdF84XjeDH iJN+Bx96psWqAeLa4mP1Cxu7kMRJSE/lZWF0osiuXcNTBe+ZWmxV2a7BVSHvqQJTaBnb OmyQ== X-Gm-Message-State: AOAM532Agiy5oBnCbvmanRUPX3HtmvNutPWe9ROt8aZbcJO4lBZFnm1i dkP43RdhNqAWXcMZU1KVs1FjMeO1xTP7FhI//x/IxzQkKYdbcfzm4eYwhtf1RWkYb4aTv4xWpEf r5XOMWv4wwSOO X-Received: by 2002:aa7:c755:: with SMTP id c21mr18592173eds.47.1612809148227; Mon, 08 Feb 2021 10:32:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpsuTp5sRzeOMNIjmosofGMT5Va6UgHF+7NHtSfOHTT8nBvBhqO12WkK46eKwRMOgobAa2CA== X-Received: by 2002:aa7:c755:: with SMTP id c21mr18592153eds.47.1612809148080; Mon, 08 Feb 2021 10:32:28 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id x5sm10415492edi.35.2021.02.08.10.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 10:32:27 -0800 (PST) Date: Mon, 8 Feb 2021 13:32:24 -0500 From: "Michael S. Tsirkin" To: Stefano Garzarella Cc: kuba@kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, "David S. Miller" , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Asias He , Claudio Imbrenda , Stefan Hajnoczi Subject: Re: [PATCH net] vsock/virtio: update credit only if socket is not closed Message-ID: <20210208133211-mutt-send-email-mst@kernel.org> References: <20210208144454.84438-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210208144454.84438-1-sgarzare@redhat.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Feb 08, 2021 at 03:44:54PM +0100, Stefano Garzarella wrote: > If the socket is closed or is being released, some resources used by > virtio_transport_space_update() such as 'vsk->trans' may be released. > > To avoid a use after free bug we should only update the available credit > when we are sure the socket is still open and we have the lock held. > > Fixes: 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko") > Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Probably stable material. > --- > net/vmw_vsock/virtio_transport_common.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c > index 5956939eebb7..e4370b1b7494 100644 > --- a/net/vmw_vsock/virtio_transport_common.c > +++ b/net/vmw_vsock/virtio_transport_common.c > @@ -1130,8 +1130,6 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, > > vsk = vsock_sk(sk); > > - space_available = virtio_transport_space_update(sk, pkt); > - > lock_sock(sk); > > /* Check if sk has been closed before lock_sock */ > @@ -1142,6 +1140,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, > goto free_pkt; > } > > + space_available = virtio_transport_space_update(sk, pkt); > + > /* Update CID in case it has changed after a transport reset event */ > vsk->local_addr.svm_cid = dst.svm_cid; > > -- > 2.29.2