netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kees Cook <kees@kernel.org>
To: Simon Horman <horms@kernel.org>
Cc: Jakub Kicinski <kuba@kernel.org>,
	"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	John Fastabend <john.fastabend@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Paolo Abeni <pabeni@redhat.com>,
	Kuniyuki Iwashima <kuniyu@google.com>,
	Willem de Bruijn <willemb@google.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	bpf@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH v2 03/10] net: Convert proto_ops bind() callbacks to use sockaddr_unspec
Date: Mon, 20 Oct 2025 11:12:51 -0700	[thread overview]
Message-ID: <202510201112.3BC3BFF@keescook> (raw)
In-Reply-To: <aO-QV3kSxaYMaZqc@horms.kernel.org>

On Wed, Oct 15, 2025 at 01:15:19PM +0100, Simon Horman wrote:
> On Tue, Oct 14, 2025 at 03:43:25PM -0700, Kees Cook wrote:
> > Update all struct proto_ops bind() callback function prototypes from
> > "struct sockaddr *" to "struct sockaddr_unspec *" to avoid lying to the
> > compiler about object sizes. Calls into struct proto handlers gain casts
> > that will be removed in the struct proto conversion patch.
> > 
> > No binary changes expected.
> > 
> > Signed-off-by: Kees Cook <kees@kernel.org>
> 
> ...
> 
> > diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
> > index b99ba14f39d2..0a795901e4f2 100644
> > --- a/net/mctp/af_mctp.c
> > +++ b/net/mctp/af_mctp.c
> > @@ -49,7 +49,7 @@ static bool mctp_sockaddr_ext_is_ok(const struct sockaddr_mctp_ext *addr)
> >  	       !addr->__smctp_pad0[2];
> >  }
> >  
> > -static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
> > +static int mctp_bind(struct socket *sock, struct sockaddr_unspec *addr, int addrlen)
> >  {
> >  	struct sock *sk = sock->sk;
> >  	struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);
> > @@ -128,7 +128,7 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
> >  /* Used to set a specific peer prior to bind. Not used for outbound
> >   * connections (Tag Owner set) since MCTP is a datagram protocol.
> >   */
> > -static int mctp_connect(struct socket *sock, struct sockaddr *addr,
> > +static int mctp_connect(struct socket *sock, struct sockaddr_unspec *addr,
> >  			int addrlen, int flags)
> >  {
> >  	struct sock *sk = sock->sk;
> 
> Hi Kees,
> 
> The change to mctp_connect() results GCC 15.2.0 warning as follows:
> 
> net/mctp/af_mctp.c:632:27: error: initialization of 'int (*)(struct socket *, struct sockaddr *, int,  int)' from incompatible pointer type 'int (*)(struct socket *, struct sockaddr_unspec *, int,  int)' [-Wincompatible-pointer-types]
>   632 |         .connect        = mctp_connect,
>       |                           ^~~~~~~~~~~~
> 
> As I don't see other _connect functions updated in this patch,
> perhaps it is out of place here and should be dropped from this patch.

Whoops, yes. Thank you! This should be part of the "connect" proto_ops
patch. I'm not sure how it ended up in here. I will move it. :)

-Kees

-- 
Kees Cook

  reply	other threads:[~2025-10-20 18:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-14 22:43 [PATCH v2 00/10] net: Introduce struct sockaddr_unspec Kees Cook
2025-10-14 22:43 ` [PATCH v2 01/10] net: Add struct sockaddr_unspec for sockaddr of unknown length Kees Cook
2025-10-14 22:43 ` [PATCH v2 02/10] net/l2tp: Add missing sa_family validation in pppol2tp_sockaddr_get_info Kees Cook
2025-10-14 22:43 ` [PATCH v2 03/10] net: Convert proto_ops bind() callbacks to use sockaddr_unspec Kees Cook
2025-10-15 12:15   ` Simon Horman
2025-10-20 18:12     ` Kees Cook [this message]
2025-10-14 22:43 ` [PATCH v2 04/10] net: Convert proto_ops connect() " Kees Cook
2025-10-14 22:43 ` [PATCH v2 05/10] net: Remove struct sockaddr from net.h Kees Cook
2025-10-14 22:43 ` [PATCH v2 06/10] net: Convert proto callbacks from sockaddr to sockaddr_unspec Kees Cook
2025-10-14 22:43 ` [PATCH v2 07/10] bpf: Convert cgroup sockaddr filters to use sockaddr_unspec consistently Kees Cook
2025-10-14 22:43 ` [PATCH v2 08/10] bpf: Convert bpf_sock_addr_kern "uaddr" to sockaddr_unspec Kees Cook
2025-10-14 22:43 ` [PATCH v2 09/10] bpf: Add size validation to bpf_sock_addr_set_sun_path() Kees Cook
2025-10-14 22:43 ` [PATCH v2 10/10] net: Convert struct sockaddr to fixed-size "sa_data[14]" Kees Cook
     [not found] ` <2095031a79fdd5a7765b9e7a0a052fb2b48895c8794a170e567273d2614da9fd@mail.kernel.org>
2025-10-14 23:56   ` [PATCH v2 00/10] net: Introduce struct sockaddr_unspec Kees Cook

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=202510201112.3BC3BFF@keescook \
    --to=kees@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=gustavo@embeddedor.com \
    --cc=horms@kernel.org \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemb@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).