mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 03:15:31 +09:00
ALSA: virtio: Replace zero-length array with flexible-array member
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. Also, make use of the struct_size() helper in kzalloc(). [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays Link: https://github.com/KSPP/linux/issues/78 Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20210929191504.GA337268@embeddedor Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
committed by
Michael S. Tsirkin
parent
fc6d70f40b
commit
601695aa8e
@@ -20,7 +20,7 @@ struct virtio_pcm_msg {
|
|||||||
struct virtio_snd_pcm_xfer xfer;
|
struct virtio_snd_pcm_xfer xfer;
|
||||||
struct virtio_snd_pcm_status status;
|
struct virtio_snd_pcm_status status;
|
||||||
size_t length;
|
size_t length;
|
||||||
struct scatterlist sgs[0];
|
struct scatterlist sgs[];
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -146,8 +146,7 @@ int virtsnd_pcm_msg_alloc(struct virtio_pcm_substream *vss,
|
|||||||
int sg_num = virtsnd_pcm_sg_num(data, period_bytes);
|
int sg_num = virtsnd_pcm_sg_num(data, period_bytes);
|
||||||
struct virtio_pcm_msg *msg;
|
struct virtio_pcm_msg *msg;
|
||||||
|
|
||||||
msg = kzalloc(sizeof(*msg) + sizeof(*msg->sgs) * (sg_num + 2),
|
msg = kzalloc(struct_size(msg, sgs, sg_num + 2), GFP_KERNEL);
|
||||||
GFP_KERNEL);
|
|
||||||
if (!msg)
|
if (!msg)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user