ALSA: seq: Use flexible array for device arguments
PATCH 1/1 ALSA: seq: Use flexible array for device arguments
snd_seq_device_new() allocates struct snd_seq_device together with a caller-specific argument area. SNDRV_SEQ_DEVICE_ARGPTR() reaches that area by adding sizeof(struct snd_seq_device) to the object pointer.
Make the trailing storage explicit with a flexible array and allocate it with struct_size(). This makes the object layout self-describing and avoids open-coded size arithmetic in the allocation and accessor.
Reject negative argsize values before calculating the allocation size. Current in-tree callers pass either zero or sizeof() values, but the function takes an int size argument and should not let a negative value flow into unsigned allocation arithmetic.
--- include/sound/seq_device.h | 3 ++- sound/core/seq_device.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)
include/sound/seq_device.h +2 -1
@@ -22,6 +22,7 @@ struct snd_seq_device {void *private_data;/* private data for the caller */ void (*private_free)(struct snd_seq_device *device);struct device dev; +unsigned char args[];/* driver-specific argument */ };#define to_seq_dev (_dev) \
@@ -64,7 +65,7 @@ void snd_seq_device_load_drivers(void);int snd_seq_device_new (struct snd_card *card,int device,const char *id,int argsize,struct snd_seq_device **result); -#define SNDRV_SEQ_DEVICE_ARGPTR (dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device)) +#define SNDRV_SEQ_DEVICE_ARGPTR (dev) ((void *)(dev)->args)int __must_check __snd_seq_driver_register (struct snd_seq_driver *drv,struct module *mod);
sound/core/seq_device.c +4 -1
@@ -234,7 +234,10 @@ int snd_seq_device_new(struct snd_card *card, int device, const char *id,if (snd_BUG_ON (!id))return -EINVAL ; - dev =kzalloc (sizeof (*dev) + argsize,GFP_KERNEL ); +if (argsize <0 ) +return -EINVAL ; + + dev =kzalloc (struct_size (dev, args, argsize),GFP_KERNEL );if (!dev)return -ENOMEM ;
---
base-commit: c784d0e6a62abbd2af58bbbe2d20f88dd550e3eb
change-id: 20260526-alsa-seq-flex-args-55b980babad7
Best regards,
Signature · 1 line
Cássio Gabriel <[email protected]>
Quoted 46 lines · Cássio Gabriel
snd_seq_device_new()allocates structsnd_seq_devicetogether with a caller-specific argument area.SNDRV_SEQ_DEVICE_ARGPTR()reaches that area by addingsizeof(struct snd_seq_device)to the object pointer.Make the trailing storage explicit with a flexible array and allocate it with
struct_size(). This makes the object layout self-describing and avoids open-coded size arithmetic in the allocation and accessor.Reject negative argsize values before calculating the allocation size. Current in-tree callers pass either zero or
sizeof()values, but the function takes an int size argument and should not let a negative value flow into unsigned allocation arithmetic.Signed-off-by Cássio Gabriel <[email protected]>--- include/sound/seq_device.h | 3 ++- sound/core/seq_device.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)include/sound/seq_device.h +2
-1@@ -22,6 +22,7 @@ struct snd_seq_device {void *private_data;/* private data for the caller */ void (*private_free)(struct snd_seq_device *device);struct device dev; +unsigned char args[];/* driver-specific argument */ };#define to_seq_dev (_dev) \@@ -64,7 +65,7 @@ void snd_seq_device_load_drivers(void);int snd_seq_device_new (struct snd_card *card,int device,const char *id,int argsize,struct snd_seq_device **result); -#define SNDRV_SEQ_DEVICE_ARGPTR (dev) (void *)((char *)(dev) + sizeof(struct snd_seq_device)) +#define SNDRV_SEQ_DEVICE_ARGPTR (dev) ((void *)(dev)->args)int __must_check __snd_seq_driver_register (struct snd_seq_driver *drv,struct module *mod);sound/core/seq_device.c +0
-0
sound/core/seq_device.c int snd_seq_device_new(struct snd_card *card, int device, const char *id, · line 242
Quoted 10 lines
sound/core/seq_device.c +4
-1@@ -234,7 +234,10 @@ int snd_seq_device_new(struct snd_card *card, int device, const char *id,if (snd_BUG_ON (!id))return -EINVAL ; - dev =kzalloc (sizeof (*dev) + argsize,GFP_KERNEL ); +if (argsize <0 ) +return -EINVAL ; + + dev =kzalloc (struct_size (dev, args, argsize),GFP_KERNEL );if (!dev)return -ENOMEM ;
IIRC, we can use kzalloc_flex() for this kind, too:
dev = kzalloc_flex(*dev, args, argsize);
thanks,
Takashi
Quoted 18 lines · Takashi Iwai
Quoted 5 lines
sound/core/seq_device.c +0
-0sound/core/seq_device.c int snd_seq_device_new(struct snd_card *card, int device, const char *id, · line 242
Quoted 10 lines
sound/core/seq_device.c +4
-1@@ -234,7 +234,10 @@ int snd_seq_device_new(struct snd_card *card, int device, const char *id,if (snd_BUG_ON (!id))return -EINVAL ; - dev =kzalloc (sizeof (*dev) + argsize,GFP_KERNEL ); +if (argsize <0 ) +return -EINVAL ; + + dev =kzalloc (struct_size (dev, args, argsize),GFP_KERNEL );if (!dev)return -ENOMEM ;IIRC, we can use
kzalloc_flex()for this kind, too:
Quoted 1 line
dev = kzalloc_flex(*dev, args, argsize);
Thanks, I missed kzalloc_flex(). I’ll keep the negative argsize check in v2, so invalid callers get -EINVAL before the count is converted to size_t.
Signature · 2 lines
Thanks, Cássio