net/compat: Update msg_control_is_user when setting a kernel pointer
authorKevin Brodsky <kevin.brodsky@arm.com>
Thu, 13 Apr 2023 11:47:04 +0000 (12:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Apr 2023 10:09:27 +0000 (11:09 +0100)
cmsghdr_from_user_compat_to_kern() is an unusual case w.r.t. how
the kmsg->msg_control* fields are used. The input struct msghdr
holds a pointer to a user buffer, i.e. ksmg->msg_control_user is
active. However, upon success, a kernel pointer is stored in
kmsg->msg_control. kmsg->msg_control_is_user should therefore be
updated accordingly.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Eric Dumazet <edumazet@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/compat.c

index 000a2e0..6564720 100644 (file)
@@ -211,6 +211,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk,
                goto Einval;
 
        /* Ok, looks like we made it.  Hook it up and return success. */
+       kmsg->msg_control_is_user = false;
        kmsg->msg_control = kcmsg_base;
        kmsg->msg_controllen = kcmlen;
        return 0;