Merge tag 'hardening-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening updates from Kees Cook: - Introduce the param_unknown_fn type and other clean ups (Andy Shevchenko) - Various __counted_by annotations (Christophe JAILLET, Gustavo A. R. Silva, Kees Cook) - Add KFENCE test to LKDTM (Stephen Boyd) - Various strncpy() refactorings (Justin Stitt) - Fix qnx4 to avoid writing into the smaller of two overlapping buffers - Various strlcpy() refactorings * tag 'hardening-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: qnx4: Use get_directory_fname() in qnx4_match() qnx4: Extract dir entry filename processing into helper atags_proc: Add __counted_by for struct buffer and use struct_size() tracing/uprobe: Replace strlcpy() with strscpy() params: Fix multi-line comment style params: Sort headers params: Use size_add() for kmalloc() params: Do not go over the limit when getting the string length params: Introduce the param_unknown_fn type lkdtm: Add kfence read after free crash type nvme-fc: replace deprecated strncpy with strscpy nvdimm/btt: replace deprecated strncpy with strscpy nvme-fabrics: replace deprecated strncpy with strscpy drm/modes: replace deprecated strncpy with strscpy_pad afs: Add __counted_by for struct afs_acl and use struct_size() VMCI: Annotate struct vmci_handle_arr with __counted_by i40e: Annotate struct i40e_qvlist_info with __counted_by HID: uhid: replace deprecated strncpy with strscpy samples: Replace strlcpy() with strscpy() SUNRPC: Replace strlcpy() with strscpy()
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
struct buffer {
|
||||
size_t size;
|
||||
char data[];
|
||||
char data[] __counted_by(size);
|
||||
};
|
||||
|
||||
static ssize_t atags_read(struct file *file, char __user *buf,
|
||||
@@ -54,7 +54,7 @@ static int __init init_atags_procfs(void)
|
||||
|
||||
WARN_ON(tag->hdr.tag != ATAG_NONE);
|
||||
|
||||
b = kmalloc(sizeof(*b) + size, GFP_KERNEL);
|
||||
b = kmalloc(struct_size(b, data, size), GFP_KERNEL);
|
||||
if (!b)
|
||||
goto nomem;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user