From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECA801FF7BE for ; Wed, 8 Jan 2025 19:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736365086; cv=none; b=B+wjMSa16uWHqPtnjeM/C7LFjYEY1xtNphdDEbkUlzATssrP9SoS8FeI0F8tB81+Qd3LdIemRXvF6RkbLOeJBaBtcAqj/Uj7mORpohwhTVRJXLARht9Snc7QYW0Pdtdf3hwkV5Ex0qtJfA+suf0CKJp0aOKg6OCMHLPNUXfgsLs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736365086; c=relaxed/simple; bh=TkDjLYrvFP4NOwyE1riU2Pn0PTqQ0huroqDV7gYV8F4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=UoAmFaKld8Si8HymZlynspn/vQpfn61MzghY61I9vpsUYsjzR+zUGiDvRa7p415K/t3WqEX5T3FNdiDBK20Z3VUvvyGgCMlbmSlp1RcmpILXcHLD2zXmZVGz/9jy1CmRyIOlFOZ2rtpWaib/Xso++WlT4hdi4erjMRwl3tD3CNA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=theori.io; spf=pass smtp.mailfrom=theori.io; dkim=pass (1024-bit key) header.d=theori.io header.i=@theori.io header.b=PVk4KKtF; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=theori.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=theori.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=theori.io header.i=@theori.io header.b="PVk4KKtF" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2f43d17b0e3so317977a91.0 for ; Wed, 08 Jan 2025 11:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=theori.io; s=google; t=1736365083; x=1736969883; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=G0bUS8Q56VQu+k4FgEf+CVIurLS+XfSNtyOspvh+PYM=; b=PVk4KKtFXjAJ49RCv/OtLG2zDEr5KfQXCOxCLwGc8HyhEIUZkMr67CNMOglSmCGtAQ sAc1UsjQHGvWdVW8fsUDGNZ13sJTleYVvC02O7DwzlQHioNTpZc+ufH3i+rLMshYkZcb /gLhSqvEfEnUPi01knyG1MMNFfemY2V0S80/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736365083; x=1736969883; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=G0bUS8Q56VQu+k4FgEf+CVIurLS+XfSNtyOspvh+PYM=; b=moHMV+A0IRc3imfBzxdWWeCRzIggmFjqYZrHpyKfp9PHwkbxUD0HwWHdJWp4YjC4Qe rdHjc8m+qhnE+HUmooO0tLAEL+MDDW7CAJrUg+uzOjAR9qt6mVYU068nZPbiWiLZwl+V Q9FGW1dVrXJ9OXiCcdoetXIEEFIoTvY59B37F1LXeoRGvP7OaKMjAuEDvq3ma9V4OR8c A4PnZyo0gNySFvXgKY575wKQRB6hZQ0vQfeuRQC0Ts3PeuBYRy1sRqy2FXf1AfCuqBLl GSXAPoN7VwObGDJMOi803WUHIJIQwzBsbIq7Em+FaXdTtHC7n8dGKhTUjkR7IZrZQnrk +caA== X-Forwarded-Encrypted: i=1; AJvYcCWcU10nyjGcnUM8LwgUJt/ZxO3muGiNt/+Ci534lsL8rlqLRWCvG2iQGKvqb/QdGgc/4AO1lEanBO5jqf8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywxy9A0tfpCG0SYhRWd6nc4BhCtvueK/Kgjydz1ZHonZG/38YTZ v2MMuo5MJyLGTGYlfbn9tt/EkCta/GGUGzrqbDXKt1/iK/eIF0nnIeJIEmtTzZM= X-Gm-Gg: ASbGncspAGR7KcwpcApWkfLAdcIHQ0xHm4GuSqvn7e2V8V/o7wR10eTTYjtsCUvZtM9 PNyHWPIjEE0DOGPnLBV21GlRdETu881PQQjU9Or2d/zGWTsFKPdohKFlNLKPfcBnF+a80ozLHLN AOKUKAoTqx687VCqubIi7UqR1k1xyDY+CwSl84g0inXVMbWzPKgnhI0SY9kHPjyEi/kQm/725PZ fQB3qoVcuGoS9zgfZG3i1ntRZkRIw/mYzOuoXxTIpHg3Mlyn0oHuR+4thPYp6uOIIbzaA== X-Google-Smtp-Source: AGHT+IHl+1LPadgc/i7lkTvjE2CfNzpvljiLkJJSgQloH84BYhz9+osKoceYZDM+dwTOSZKMzh86qg== X-Received: by 2002:a17:90b:3904:b0:2ea:b564:4b31 with SMTP id 98e67ed59e1d1-2f548f64240mr5502673a91.19.1736365083357; Wed, 08 Jan 2025 11:38:03 -0800 (PST) Received: from v4bel-B760M-AORUS-ELITE-AX ([211.219.71.65]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f54a2872a3sm1963200a91.16.2025.01.08.11.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 11:38:03 -0800 (PST) Date: Wed, 8 Jan 2025 14:37:55 -0500 From: Hyunwoo Kim To: Stefano Garzarella Cc: netdev@vger.kernel.org, Simon Horman , Stefan Hajnoczi , linux-kernel@vger.kernel.org, Eric Dumazet , Xuan Zhuo , Wongi Lee , "David S. Miller" , Paolo Abeni , Jason Wang , Bobby Eshleman , virtualization@lists.linux.dev, Eugenio =?iso-8859-1?Q?P=E9rez?= , Luigi Leonardi , bpf@vger.kernel.org, Jakub Kicinski , "Michael S. Tsirkin" , Michal Luczaj , kvm@vger.kernel.org, v4bel@theori.io, imv4bel@gmail.com Subject: Re: [PATCH net 2/2] vsock/bpf: return early if transport is not assigned Message-ID: References: <20250108180617.154053-1-sgarzare@redhat.com> <20250108180617.154053-3-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250108180617.154053-3-sgarzare@redhat.com> On Wed, Jan 08, 2025 at 07:06:17PM +0100, Stefano Garzarella wrote: > Some of the core functions can only be called if the transport > has been assigned. > > As Michal reported, a socket might have the transport at NULL, > for example after a failed connect(), causing the following trace: > > BUG: kernel NULL pointer dereference, address: 00000000000000a0 > #PF: supervisor read access in kernel mode > #PF: error_code(0x0000) - not-present page > PGD 12faf8067 P4D 12faf8067 PUD 113670067 PMD 0 > Oops: Oops: 0000 [#1] PREEMPT SMP NOPTI > CPU: 15 UID: 0 PID: 1198 Comm: a.out Not tainted 6.13.0-rc2+ > RIP: 0010:vsock_connectible_has_data+0x1f/0x40 > Call Trace: > vsock_bpf_recvmsg+0xca/0x5e0 > sock_recvmsg+0xb9/0xc0 > __sys_recvfrom+0xb3/0x130 > __x64_sys_recvfrom+0x20/0x30 > do_syscall_64+0x93/0x180 > entry_SYSCALL_64_after_hwframe+0x76/0x7e > > So we need to check the `vsk->transport` in vsock_bpf_recvmsg(), > especially for connected sockets (stream/seqpacket) as we already > do in __vsock_connectible_recvmsg(). > > Fixes: 634f1a7110b4 ("vsock: support sockmap") > Reported-by: Michal Luczaj > Closes: https://lore.kernel.org/netdev/5ca20d4c-1017-49c2-9516-f6f75fd331e9@rbox.co/ > Signed-off-by: Stefano Garzarella > --- > net/vmw_vsock/vsock_bpf.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c > index 4aa6e74ec295..f201d9eca1df 100644 > --- a/net/vmw_vsock/vsock_bpf.c > +++ b/net/vmw_vsock/vsock_bpf.c > @@ -77,6 +77,7 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, > size_t len, int flags, int *addr_len) > { > struct sk_psock *psock; > + struct vsock_sock *vsk; > int copied; > > psock = sk_psock_get(sk); > @@ -84,6 +85,13 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, > return __vsock_recvmsg(sk, msg, len, flags); > > lock_sock(sk); > + vsk = vsock_sk(sk); > + > + if (!vsk->transport) { > + copied = -ENODEV; > + goto out; > + } > + > if (vsock_has_data(sk, psock) && sk_psock_queue_empty(psock)) { > release_sock(sk); > sk_psock_put(sk, psock); > @@ -108,6 +116,7 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, > copied = sk_msg_recvmsg(sk, psock, msg, len, flags); > } > > +out: > release_sock(sk); > sk_psock_put(sk, psock); > > -- > 2.47.1 > Looks good to me. Reviewed-by: Hyunwoo Kim Regards, Hyunwoo Kim