mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
f5cc9cdfc9
Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct snd_usx2y_urb_seq. Additionally, since the element count member must be set before accessing the annotated flexible array member, move its initialization earlier. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20230922175046.work.766-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
89 lines
2.1 KiB
C
89 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef USBUSX2Y_H
|
|
#define USBUSX2Y_H
|
|
#include "../usbaudio.h"
|
|
#include "../midi.h"
|
|
#include "usbus428ctldefs.h"
|
|
|
|
#define NRURBS 2
|
|
|
|
|
|
#define URBS_ASYNC_SEQ 10
|
|
#define URB_DATA_LEN_ASYNC_SEQ 32
|
|
struct snd_usx2y_async_seq {
|
|
struct urb *urb[URBS_ASYNC_SEQ];
|
|
char *buffer;
|
|
};
|
|
|
|
struct snd_usx2y_urb_seq {
|
|
int submitted;
|
|
int len;
|
|
struct urb *urb[] __counted_by(len);
|
|
};
|
|
|
|
#include "usx2yhwdeppcm.h"
|
|
|
|
struct usx2ydev {
|
|
struct usb_device *dev;
|
|
int card_index;
|
|
int stride;
|
|
struct urb *in04_urb;
|
|
void *in04_buf;
|
|
char in04_last[24];
|
|
unsigned int in04_int_calls;
|
|
struct snd_usx2y_urb_seq *us04;
|
|
wait_queue_head_t in04_wait_queue;
|
|
struct snd_usx2y_async_seq as04;
|
|
unsigned int rate,
|
|
format;
|
|
int chip_status;
|
|
struct mutex pcm_mutex;
|
|
struct us428ctls_sharedmem *us428ctls_sharedmem;
|
|
int wait_iso_frame;
|
|
wait_queue_head_t us428ctls_wait_queue_head;
|
|
struct snd_usx2y_hwdep_pcm_shm *hwdep_pcm_shm;
|
|
struct snd_usx2y_substream *subs[4];
|
|
struct snd_usx2y_substream * volatile prepare_subs;
|
|
wait_queue_head_t prepare_wait_queue;
|
|
struct list_head midi_list;
|
|
int pcm_devs;
|
|
};
|
|
|
|
|
|
struct snd_usx2y_substream {
|
|
struct usx2ydev *usx2y;
|
|
struct snd_pcm_substream *pcm_substream;
|
|
|
|
int endpoint;
|
|
unsigned int maxpacksize; /* max packet size in bytes */
|
|
|
|
atomic_t state;
|
|
#define STATE_STOPPED 0
|
|
#define STATE_STARTING1 1
|
|
#define STATE_STARTING2 2
|
|
#define STATE_STARTING3 3
|
|
#define STATE_PREPARED 4
|
|
#define STATE_PRERUNNING 6
|
|
#define STATE_RUNNING 8
|
|
|
|
int hwptr; /* free frame position in the buffer (only for playback) */
|
|
int hwptr_done; /* processed frame position in the buffer */
|
|
int transfer_done; /* processed frames since last period update */
|
|
|
|
struct urb *urb[NRURBS]; /* data urb table */
|
|
struct urb *completed_urb;
|
|
char *tmpbuf; /* temporary buffer for playback */
|
|
};
|
|
|
|
|
|
#define usx2y(c) ((struct usx2ydev *)(c)->private_data)
|
|
|
|
int usx2y_audio_create(struct snd_card *card);
|
|
|
|
int usx2y_async_seq04_init(struct usx2ydev *usx2y);
|
|
int usx2y_in04_init(struct usx2ydev *usx2y);
|
|
|
|
#define NAME_ALLCAPS "US-X2Y"
|
|
|
|
#endif
|