diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-25 13:56:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-25 13:56:57 -0700 |
| commit | 62e5873ec96bc2cfe809a1bc123af8101989ef5f (patch) | |
| tree | 28f91bab5baa892410b06d03c311d97accd039c6 /fs | |
| parent | a3a8b54b4f1a261656eb6c9a517e68e1204cef39 (diff) | |
| parent | 746f1b0ac5bf6ecfb71674af210ae476aa714f46 (diff) | |
| download | linux-62e5873ec96bc2cfe809a1bc123af8101989ef5f.tar.gz linux-62e5873ec96bc2cfe809a1bc123af8101989ef5f.tar.bz2 linux-62e5873ec96bc2cfe809a1bc123af8101989ef5f.zip | |
Merge tag 'size_t-saturating-helpers-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux
Pull misc hardening updates from Gustavo Silva:
"Replace a few open-coded instances with size_t saturating arithmetic
helpers"
* tag 'size_t-saturating-helpers-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
virt: acrn: Prefer array_size and struct_size over open coded arithmetic
afs: Prefer struct_size over open coded arithmetic
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/security.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/afs/security.c b/fs/afs/security.c index 3c7a8fc4f93f..7c6a63a30394 100644 --- a/fs/afs/security.c +++ b/fs/afs/security.c @@ -219,8 +219,7 @@ void afs_cache_permit(struct afs_vnode *vnode, struct key *key, * yet. */ size++; - new = kzalloc(sizeof(struct afs_permits) + - sizeof(struct afs_permit) * size, GFP_NOFS); + new = kzalloc(struct_size(new, permits, size), GFP_NOFS); if (!new) goto out_put; |