From nobody Fri Dec 19 19:18:33 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 B173C20897B for ; Fri, 10 Jan 2025 08:35:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736498144; cv=none; b=pJ2dLSiWj1euC5yn0S3JrMJhs9rgBMty8OX/LV+8MAXd3R/1Uk5vciT8IczJyLJMELqGWX8rpKUU30ZgNTk2fc3/IH+siSr/QU9lR6nCvGiDtmarf/wY46WEZR0pyBtEaXCSA+kXXs6tblAqiw6ZlEcywMILrCowAzcWxI2CkNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736498144; c=relaxed/simple; bh=uPsduUWhdScehzIkWWVjxwh3m7xAtK9UHuNXKkdV3cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pzymEtnorTlB5xM2MkQmVSZ2OrsikZP5QUEtpVGA98+jtpY1eXXBXc87knP/Mog3wWZ/ma/ht21F9/e7hQP5tsWiWShwoD73nBDSoCc4gmJAnpvBGdtvksRxsjC/5om7VBn6Ctd/k4awPdXzcfJFiGJ9BwkeF0CS49Q7E/9lG8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=P1PPdZ99; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P1PPdZ99" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736498141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i/UxJFQhjZHiTLyDu6i94GmVxCXul14lCOVKyB1E+sY=; b=P1PPdZ99n92Uc8zsuCYTOeZlzGlJxfQS/MdOUwvWN4jZpsSXH4HhxlXpBPMmW1VMV7E7ie WpREVjgCOgbdg8QBx4SnprjyRyKeQChMUrYPUMfKtsyFzGL+gxBUM6fdOnVjlui8GssAdj rLd0OH7bg++sr8DLtp4oSC3aGhjBMIU= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-78l5DoP6O0S0xhBjZvEeCg-1; Fri, 10 Jan 2025 03:35:40 -0500 X-MC-Unique: 78l5DoP6O0S0xhBjZvEeCg-1 X-Mimecast-MFC-AGG-ID: 78l5DoP6O0S0xhBjZvEeCg Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-385e2579507so784740f8f.1 for ; Fri, 10 Jan 2025 00:35:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736498139; x=1737102939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i/UxJFQhjZHiTLyDu6i94GmVxCXul14lCOVKyB1E+sY=; b=QxJLf1Qz5f7wr/1FpjbxUyiUWytrIXflzxpEob1+V0TEbc0EFTx4oWiNMDAnmxtvrI JuHBpmUoHLwStqLXoenbOBpDBK50RLRNCR7Waf9NEBWYUQoq+qRDAizFM01oHI6FjnYS wrQtZ/umVK/QsB4Fxk1Ah/zMe4646BhqUqUoOBMgopU+4V5cuKBSoQ34hsGXPma1EJIM q6RUU94Jz9/QVk+xRp+HM8Zn9lgzHE8ZNiUzzAgJVlpUuzjq7qDcFcLp0LrOlDDe8sQV cGH8sy0FFS6FUTpPDVOUW0NsJChyF1DoDqBU4jOB/0in87Z4wLLlsAB7r+n+CqfR3zM0 6n+g== X-Forwarded-Encrypted: i=1; AJvYcCWirsMwzF33rui7Fb6UwHA+TfvqAZtlNbUyMrHLDd5KuQWV90mxy7Np7CsOM+FlLsI7v29WtFF441KjYeU=@vger.kernel.org X-Gm-Message-State: AOJu0YzjWRWavVoEHdSI5WBCsPF9sL0HqDiRU3++G7wmFWdNa+GfHAVb M089bhDUyroewtESDd2vK7RPgvcvZvlv8xJj4L/Xm7vKXb2YKX1Q+5U2b1WGxTuaB0qf2EXpnhf eX1y8MKEr5+fgbxEJwBhFfwx66LsKNVrywZEPLxUzAFN1CUdJ3B33FOHLcj0Ksw== X-Gm-Gg: ASbGnctlIKSabbxuu3paGmemZyfm8kpVzic3yWoIk1LYrKkYnpIDgAP4rRFKl/FVWjI rNhj1HEpp8EIx7QkeRykCxfBhbEqGpubzBiwuZA60VpKYRFibVmNMzNU6tyCZeEFj9VQWL/eK/q rXO7Bju4yxtbLijUTr6+NtZcwXXHGzTBR0Ji9p8lj/7TDeAwtluEAcIv/uz6zcBiJ2F6oo2TnC0 o9l2D5bZvqrEOZB30BpWdaz6eUiB4AhMrtliBszqyjRJqA= X-Received: by 2002:adf:ae59:0:b0:38a:88b8:97a9 with SMTP id ffacd0b85a97d-38a88b898b4mr6672306f8f.2.1736498138762; Fri, 10 Jan 2025 00:35:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0wfwdkUAlCHyAfjqywZwwjbDz7xJE+/6M4bU0+8jxnFXT/mEU5AdPqfdlVeWVXgoMTeKpvg== X-Received: by 2002:adf:ae59:0:b0:38a:88b8:97a9 with SMTP id ffacd0b85a97d-38a88b898b4mr6672275f8f.2.1736498138249; Fri, 10 Jan 2025 00:35:38 -0800 (PST) Received: from step1.. ([5.77.78.183]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b8214sm3895187f8f.78.2025.01.10.00.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 00:35:37 -0800 (PST) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Xuan Zhuo , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Luigi Leonardi , "David S. Miller" , Wongi Lee , Stefano Garzarella , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "Michael S. Tsirkin" , Eric Dumazet , kvm@vger.kernel.org, Paolo Abeni , Stefan Hajnoczi , Jason Wang , Simon Horman , Hyunwoo Kim , Jakub Kicinski , Michal Luczaj , virtualization@lists.linux.dev, Bobby Eshleman , stable@vger.kernel.org Subject: [PATCH net v2 4/5] vsock: reset socket state when de-assigning the transport Date: Fri, 10 Jan 2025 09:35:10 +0100 Message-ID: <20250110083511.30419-5-sgarzare@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250110083511.30419-1-sgarzare@redhat.com> References: <20250110083511.30419-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Transport's release() and destruct() are called when de-assigning the vsock transport. These callbacks can touch some socket state like sock flags, sk_state, and peer_shutdown. Since we are reassigning the socket to a new transport during vsock_connect(), let's reset these fields to have a clean state with the new transport. Fixes: c0cfa2d8a788 ("vsock: add multi-transports support") Cc: stable@vger.kernel.org Signed-off-by: Stefano Garzarella Reviewed-by: Luigi Leonardi --- net/vmw_vsock/af_vsock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 5cf8109f672a..74d35a871644 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -491,6 +491,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, str= uct vsock_sock *psk) */ vsk->transport->release(vsk); vsock_deassign_transport(vsk); + + /* transport's release() and destruct() can touch some socket + * state, since we are reassigning the socket to a new transport + * during vsock_connect(), let's reset these fields to have a + * clean state. + */ + sock_reset_flag(sk, SOCK_DONE); + sk->sk_state =3D TCP_CLOSE; + vsk->peer_shutdown =3D 0; } =20 /* We increase the module refcnt to prevent the transport unloading --=20 2.47.1