From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 35E2A6FE01; Mon, 29 Jan 2024 17:14:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548481; cv=none; b=glkPNfa29ABv+6X1GNoVW44ZBajPjc1WwwLErsuHHQJeTgRwZq8tmP3dVTvKS345mv+4RyU5C63aknovv6NyU285RaJF62LAuRqYg5Z70kjFxvxMLSmsrIm98IYBcvNBPihV74G7lcGTkXOufzO8DoJ/WsRohT3YMdYdMmZC3W4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548481; c=relaxed/simple; bh=H2MnVf3BWFL+45y49hXx7T1Y96x4hcFl10Es82snsSw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AgvaVU1jqbftkGklrjMj6OB7judFrzZueOp9YnMu5hdOB4KhpT4VKawJhicAElG95kviJ/vbdLbg3q5tPyCDAGekXhlBNCJ5PSxymiuVAP+cAPl3DW0CLk45aIL4q+I8sAgtlvVN8eBrSE3KkB8mAVdkWnGx9OHJBLXOSZM69r0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0namRjyc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0namRjyc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F10D2C43394; Mon, 29 Jan 2024 17:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548481; bh=H2MnVf3BWFL+45y49hXx7T1Y96x4hcFl10Es82snsSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0namRjycgZ3C2M/jjuPR0tjAwN8DbK+LWRKsbUDr63fl72sC9TWzeghP6tigyrJUP e8xavIg3hxqa5xL8LCdGIw8k9eSwM1brjiBeqTQ70pv8jvLobQafPlMDedWyRFUu7i laqo40pnTqmspQbbMOjGLWYNpMeMXMSlRTmUQLjE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jordan Rife , David Teigland Subject: [PATCH 6.6 100/331] dlm: use kernel_connect() and kernel_bind() Date: Mon, 29 Jan 2024 09:02:44 -0800 Message-ID: <20240129170017.856415166@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170014.969142961@linuxfoundation.org> References: <20240129170014.969142961@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jordan Rife commit e9cdebbe23f1aa9a1caea169862f479ab3fa2773 upstream. Recent changes to kernel_connect() and kernel_bind() ensure that callers are insulated from changes to the address parameter made by BPF SOCK_ADDR hooks. This patch wraps direct calls to ops->connect() and ops->bind() with kernel_connect() and kernel_bind() to protect callers in such cases. Link: https://lore.kernel.org/netdev/9944248dba1bce861375fcce9de663934d933ba9.camel@redhat.com/ Fixes: d74bad4e74ee ("bpf: Hooks for sys_connect") Fixes: 4fbac77d2d09 ("bpf: Hooks for sys_bind") Cc: stable@vger.kernel.org Signed-off-by: Jordan Rife Signed-off-by: David Teigland Signed-off-by: Greg Kroah-Hartman --- fs/dlm/lowcomms.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1805,8 +1805,8 @@ static int dlm_tcp_bind(struct socket *s memcpy(&src_addr, &dlm_local_addr[0], sizeof(src_addr)); make_sockaddr(&src_addr, 0, &addr_len); - result = sock->ops->bind(sock, (struct sockaddr *)&src_addr, - addr_len); + result = kernel_bind(sock, (struct sockaddr *)&src_addr, + addr_len); if (result < 0) { /* This *may* not indicate a critical error */ log_print("could not bind for connect: %d", result); @@ -1818,7 +1818,7 @@ static int dlm_tcp_bind(struct socket *s static int dlm_tcp_connect(struct connection *con, struct socket *sock, struct sockaddr *addr, int addr_len) { - return sock->ops->connect(sock, addr, addr_len, O_NONBLOCK); + return kernel_connect(sock, addr, addr_len, O_NONBLOCK); } static int dlm_tcp_listen_validate(void) @@ -1850,8 +1850,8 @@ static int dlm_tcp_listen_bind(struct so /* Bind to our port */ make_sockaddr(&dlm_local_addr[0], dlm_config.ci_tcp_port, &addr_len); - return sock->ops->bind(sock, (struct sockaddr *)&dlm_local_addr[0], - addr_len); + return kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0], + addr_len); } static const struct dlm_proto_ops dlm_tcp_ops = { @@ -1876,12 +1876,12 @@ static int dlm_sctp_connect(struct conne int ret; /* - * Make sock->ops->connect() function return in specified time, + * Make kernel_connect() function return in specified time, * since O_NONBLOCK argument in connect() function does not work here, * then, we should restore the default value of this attribute. */ sock_set_sndtimeo(sock->sk, 5); - ret = sock->ops->connect(sock, addr, addr_len, 0); + ret = kernel_connect(sock, addr, addr_len, 0); sock_set_sndtimeo(sock->sk, 0); return ret; }