ALSA: core: Use flexible array for card private data
PATCH v2 1/1 ALSA: core: Use flexible array for card private data
snd_card_new() and snd_devm_card_new() allocate struct snd_card together with optional driver-private storage. The storage is currently described only by open-coded sizeof(*card) + extra_size arithmetic, and snd_card_init() reaches it by manually adding sizeof(struct snd_card) to the card pointer.
Make the trailing storage explicit with a flexible array member. Use kzalloc_flex() for the regular allocation path and struct_size() for the devres allocation size. This documents the layout and avoids open-coded variable-size object arithmetic.
Align the flexible array to unsigned long long so the driver-private area does not become less aligned than the old sizeof(struct snd_card) tail address on 32-bit ABIs.
---
Changes in v2:
- Use kzalloc_flex() for the snd_card_new() allocation path.
- Link to v1: https://patch.msgid.link/20260529-alsa-card-private-flex-array-v1-1-370eb58e251a@gmail.com
--- include/sound/core.h | 2 ++ sound/core/init.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
include/sound/core.h +2 -0
@@ -148,6 +148,8 @@ struct snd_card {struct snd_mixer_oss *mixer_oss;int mixer_oss_change_count;#endif + +unsigned char private_data_area[]__aligned(__alignof__(unsigned long long)) ; };#define dev_to_snd_card (p) container_of(p, struct snd_card, card_dev)
sound/core/init.c +4 -3
@@ -181,7 +181,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid,if (extra_size <0 ) extra_size =0 ; - card =kzalloc (sizeof (*card) + extra_size,GFP_KERNEL ); + card =kzalloc_flex (*card, private_data_area, extra_size);if (!card)return -ENOMEM ;
@@ -232,7 +232,8 @@ int snd_devm_card_new(struct device *parent, int idx, const char *xid,int err; *card_ret =NULL ; - card =devres_alloc (__snd_card_release,sizeof (*card) + extra_size, + card =devres_alloc (__snd_card_release, +struct_size (card, private_data_area, extra_size),GFP_KERNEL );if (!card)return -ENOMEM ;
@@ -280,7 +281,7 @@ static int snd_card_init(struct snd_card *card, struct device *parent,int err;if (extra_size >0 ) - card->private_data = (char *)card +sizeof (struct snd_card ); + card->private_data = card->private_data_area;if (xid)strscpy (card->id, xid,sizeof (card->id)); err =0 ;
---
base-commit: 5fa82dd6492e9ac3ab27d2c15d73b601b4e6a87d
change-id: 20260531-alsa-card-private-flex-array-278c5b3091ac
Best regards,
Signature · 1 line
Cássio Gabriel <[email protected]>
Takashi Iwai
AppliedQuoted 12 lines · Cássio Gabriel
snd_card_new()andsnd_devm_card_new()allocate structsnd_cardtogether with optional driver-private storage. The storage is currently described only by open-codedsizeof(*card)+extra_sizearithmetic, andsnd_card_init()reaches it by manually addingsizeof(struct snd_card)to the card pointer.Make the trailing storage explicit with a flexible array member. Use
kzalloc_flex()for the regular allocation path andstruct_size()for the devres allocation size. This documents the layout and avoids open-coded variable-size object arithmetic.
Quoted 5 lines
Align the flexible array to unsigned long long so the driver-private area does not become less aligned than the old
sizeof(struct snd_card)tail address on 32-bit ABIs.Signed-off-by Cássio Gabriel <[email protected]>
Applied to for-next branch now. Thanks.
Takashi