net/af_iucv: Use struct_group() to zero struct iucv_sock region

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.

Add struct_group() to mark the region of struct iucv_sock that gets
initialized to zero. Avoid the future warning:

In function 'fortify_memset_chk',
    inlined from 'iucv_sock_alloc' at net/iucv/af_iucv.c:476:2:
./include/linux/fortify-string.h:199:4: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning]
  199 |    __write_overflow_field(p_size_field, size);
      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Acked-by: Karsten Graul <kgraul@linux.ibm.com>
Link: https://lore.kernel.org/lkml/19ff61a0-0cda-6000-ce56-dc6b367c00d6@linux.ibm.com/
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index ff06246dbbb946bbb8820b068f49a3910c4a59a7..df85d19fbf8492dc087d96aa0b3e33ee3762c575 100644 (file)
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -112,10 +112,12 @@ enum iucv_tx_notify {
 
 struct iucv_sock {
        struct sock             sk;
-       char                    src_user_id[8];
-       char                    src_name[8];
-       char                    dst_user_id[8];
-       char                    dst_name[8];
+       struct_group(init,
+               char            src_user_id[8];
+               char            src_name[8];
+               char            dst_user_id[8];
+               char            dst_name[8];
+       );
        struct list_head        accept_q;
        spinlock_t              accept_q_lock;
        struct sock             *parent;

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 996ccf3665e3e58deafb0c1e9dae12e1e45b4e4d..49ecbe8d176acd0b8350d1d50d23c202aa57008b 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -473,7 +473,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio,
        atomic_set(&iucv->msg_recv, 0);
        iucv->path = NULL;
        iucv->sk_txnotify = afiucv_hs_callback_txnotify;
-       memset(&iucv->src_user_id , 0, 32);
+       memset(&iucv->init, 0, sizeof(iucv->init));
        if (pr_iucv)
                iucv->transport = AF_IUCV_TRANS_IUCV;
        else