moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: firewire-lib: code refactoring for check of CIP header about payload size

Browse Source 
The size of CIP payload is now passed to helper function to parse CIP
header.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210518130048.146596-7-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto
2021-05-18 22:00:45 +09:00
committed by Takashi Iwai
parent ebd2a647e2
commit 4fd1878766
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/firewire/amdtp-stream.c
View File

@@ -574,8 +574,7 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf,
/* Calculate data blocks */ /* Calculate data blocks */
fdf = (cip_header[1] & CIP_FDF_MASK) >> CIP_FDF_SHIFT; fdf = (cip_header[1] & CIP_FDF_MASK) >> CIP_FDF_SHIFT;
if (payload_length < sizeof(__be32) * 2 || if (payload_length == 0 || (fmt == CIP_FMT_AM && fdf == AMDTP_FDF_NO_DATA)) {
(fmt == CIP_FMT_AM && fdf == AMDTP_FDF_NO_DATA)) {
*data_blocks = 0; *data_blocks = 0;
} else { } else {
unsigned int data_block_quadlets = unsigned int data_block_quadlets =
@@ -590,8 +589,7 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf,
if (s->flags & CIP_WRONG_DBS) if (s->flags & CIP_WRONG_DBS)
data_block_quadlets = s->data_block_quadlets; data_block_quadlets = s->data_block_quadlets;
*data_blocks = (payload_length / sizeof(__be32) - 2) / *data_blocks = payload_length / sizeof(__be32) / data_block_quadlets;
data_block_quadlets;
} }
/* Check data block counter continuity */ /* Check data block counter continuity */
@@ -658,8 +656,8 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
if (cip_header_size > 0) { if (cip_header_size > 0) {
if (payload_length >= cip_header_size) { if (payload_length >= cip_header_size) {
cip_header = ctx_header + 2; cip_header = ctx_header + 2;
err = check_cip_header(s, cip_header, payload_length, data_blocks, err = check_cip_header(s, cip_header, payload_length - cip_header_size,
data_block_counter, syt); data_blocks, data_block_counter, syt);
if (err < 0) if (err < 0)
return err; return err;
} else { } else {