Merge tag 'xfs-5.16-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / net / mctp / af_mctp.c

diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
index d344b02..871cf62 100644 (file)
--- a/net/mctp/af_mctp.c
+++ b/net/mctp/af_mctp.c
@@ -33,6 +33,19 @@ static int mctp_release(struct socket *sock)
        return 0;
 }
 
+/* Generic sockaddr checks, padding checks only so far */
+static bool mctp_sockaddr_is_ok(const struct sockaddr_mctp *addr)
+{
+       return !addr->__smctp_pad0 && !addr->__smctp_pad1;
+}
+
+static bool mctp_sockaddr_ext_is_ok(const struct sockaddr_mctp_ext *addr)
+{
+       return !addr->__smctp_pad0[0] &&
+              !addr->__smctp_pad0[1] &&
+              !addr->__smctp_pad0[2];
+}
+
 static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
 {
        struct sock *sk = sock->sk;
@@ -52,6 +65,9 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
        /* it's a valid sockaddr for MCTP, cast and do protocol checks */
        smctp = (struct sockaddr_mctp *)addr;
 
+       if (!mctp_sockaddr_is_ok(smctp))
+               return -EINVAL;
+
        lock_sock(sk);
 
        /* TODO: allow rebind */
@@ -87,6 +103,8 @@ static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
                        return -EINVAL;
                if (addr->smctp_family != AF_MCTP)
                        return -EINVAL;
+               if (!mctp_sockaddr_is_ok(addr))
+                       return -EINVAL;
                if (addr->smctp_tag & ~(MCTP_TAG_MASK | MCTP_TAG_OWNER))
                        return -EINVAL;
 
@@ -124,7 +142,8 @@ static int mctp_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
                DECLARE_SOCKADDR(struct sockaddr_mctp_ext *,
                                 extaddr, msg->msg_name);
 
-               if (extaddr->smctp_halen > sizeof(cb->haddr)) {
+               if (!mctp_sockaddr_ext_is_ok(extaddr) ||
+                   extaddr->smctp_halen > sizeof(cb->haddr)) {
                        rc = -EINVAL;
                        goto err_free;
                }
@@ -198,11 +217,13 @@ static int mctp_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 
                addr = msg->msg_name;
                addr->smctp_family = AF_MCTP;
+               addr->__smctp_pad0 = 0;
                addr->smctp_network = cb->net;
                addr->smctp_addr.s_addr = hdr->src;
                addr->smctp_type = type;
                addr->smctp_tag = hdr->flags_seq_tag &
                                        (MCTP_HDR_TAG_MASK | MCTP_HDR_FLAG_TO);
+               addr->__smctp_pad1 = 0;
                msg->msg_namelen = sizeof(*addr);
 
                if (msk->addr_ext) {
@@ -211,6 +232,7 @@ static int mctp_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
                        msg->msg_namelen = sizeof(*ae);
                        ae->smctp_ifindex = cb->ifindex;
                        ae->smctp_halen = cb->halen;
+                       memset(ae->__smctp_pad0, 0x0, sizeof(ae->__smctp_pad0));
                        memset(ae->smctp_haddr, 0x0, sizeof(ae->smctp_haddr));
                        memcpy(ae->smctp_haddr, cb->haddr, cb->halen);
                }