Merge tag 'overflow-v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-block.git] / fs / afs / addr_list.c

diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c
index 7587fb665ff189b088b1a9bb9e8c1b7c7005c083..2c46c46f3a6d2ed362b2de1e8106044a80caedfb 100644 (file)
--- a/fs/afs/addr_list.c
+++ b/fs/afs/addr_list.c
@@ -43,8 +43,7 @@ struct afs_addr_list *afs_alloc_addrlist(unsigned int nr,
 
        _enter("%u,%u,%u", nr, service, port);
 
-       alist = kzalloc(sizeof(*alist) + sizeof(alist->addrs[0]) * nr,
-                       GFP_KERNEL);
+       alist = kzalloc(struct_size(alist, addrs, nr), GFP_KERNEL);
        if (!alist)
                return NULL;