ALSA: usb-audio: Recurse before saving terminal properties
PATCH v2 1/1 ALSA: usb-audio: Recurse before saving terminal properties
The input terminal parser recurses into the referenced clock entity to verify it is existant and thus the terminal descriptor is valid. The actual property values of the term instance which is initially parsed must not be overriden by the recursion. For this to work the term properties have to be assigned after recursing into the referenced clock entity descriptors.
---
Changes in v2:
- Store term->id after recursion as well, as it gets overriden in the recursion
- Add comments explaining that the recursion is only for validation of the descriptor validity
--- sound/usb/mixer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
sound/usb/mixer.c +11 -5
@@ -731,15 +731,21 @@ static int check_input_term(struct mixer_build *state, int id, term->name = d->iTerminal; }else {/* UAC_VERSION_2 */ struct uac2_input_terminal_descriptor *d = p1; - term->type =le16_to_cpu (d->wTerminalType); - term->channels = d->bNrChannels; - term->chconfig =le32_to_cpu (d->bmChannelConfig); - term->name = d->iTerminal; -/* call recursively to get the clock selectors */ +/* call recursively to verify that the +* referenced clock entity is valid */ err =check_input_term (state, d->bCSourceID, term);if (err <0 )return err; + +/* save input term properties after recursion, +* to ensure they are not overriden by the +* recursion calls */ + term->id = id; + term->type =le16_to_cpu (d->wTerminalType); + term->channels = d->bNrChannels; + term->chconfig =le32_to_cpu (d->bmChannelConfig); + term->name = d->iTerminal; }return 0 ;case UAC_FEATURE_UNIT : {
Signature · 1 line
2.5.0
Quoted 7 lines · Julian Scheel
The input terminal parser recurses into the referenced clock entity to verify it is existant and thus the terminal descriptor is valid. The actual property values of the term instance which is initially parsed must not be overriden by the recursion. For this to work the term properties have to be assigned after recursing into the referenced clock entity descriptors.
Signed-off-by Julian Scheel <[email protected]>
Given your explanations, I believe this is the right thing to do.
Thanks!
Quoted 42 lines
---
Changes in v2:
- Storeterm->idafter recursion as well, as it gets overriden in the recursion
- Add comments explaining that the recursion is only for validation of the descriptor validity--- sound/usb/mixer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)sound/usb/mixer.c +11
-5@@ -731,15 +731,21 @@ static int check_input_term(struct mixer_build *state, int id, term->name = d->iTerminal; }else {/* UAC_VERSION_2 */ struct uac2_input_terminal_descriptor *d = p1; - term->type =le16_to_cpu (d->wTerminalType); - term->channels = d->bNrChannels; - term->chconfig =le32_to_cpu (d->bmChannelConfig); - term->name = d->iTerminal; -/* call recursively to get the clock selectors */ +/* call recursively to verify that the +* referenced clock entity is valid */ err =check_input_term (state, d->bCSourceID, term);if (err <0 )return err; + +/* save input term properties after recursion, +* to ensure they are not overriden by the +* recursion calls */ + term->id = id; + term->type =le16_to_cpu (d->wTerminalType); + term->channels = d->bNrChannels; + term->chconfig =le32_to_cpu (d->bmChannelConfig); + term->name = d->iTerminal; }return 0 ;case UAC_FEATURE_UNIT : {
Quoted 8 lines · Daniel Mack
Quoted 6 lines · Julian Scheel
The input terminal parser recurses into the referenced clock entity to verify it is existant and thus the terminal descriptor is valid. The actual property values of the term instance which is initially parsed must not be overriden by the recursion. For this to work the term properties have to be assigned after recursing into the referenced clock entity descriptors.
Quoted 5 lines
Quoted 1 line
Signed-off-by Julian Scheel <[email protected]>Given your explanations, I believe this is the right thing to do.
Acked-by Daniel Mack <[email protected]>
Thanks. It's no urgent fix, I'm going to queue it to for-next branch.
Takashi
Quoted 48 lines
Thanks!
Quoted 42 lines
---
Changes in v2:
- Storeterm->idafter recursion as well, as it gets overriden in the recursion
- Add comments explaining that the recursion is only for validation of the descriptor validity--- sound/usb/mixer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)sound/usb/mixer.c +11
-5@@ -731,15 +731,21 @@ static int check_input_term(struct mixer_build *state, int id, term->name = d->iTerminal; }else {/* UAC_VERSION_2 */ struct uac2_input_terminal_descriptor *d = p1; - term->type =le16_to_cpu (d->wTerminalType); - term->channels = d->bNrChannels; - term->chconfig =le32_to_cpu (d->bmChannelConfig); - term->name = d->iTerminal; -/* call recursively to get the clock selectors */ +/* call recursively to verify that the +* referenced clock entity is valid */ err =check_input_term (state, d->bCSourceID, term);if (err <0 )return err; + +/* save input term properties after recursion, +* to ensure they are not overriden by the +* recursion calls */ + term->id = id; + term->type =le16_to_cpu (d->wTerminalType); + term->channels = d->bNrChannels; + term->chconfig =le32_to_cpu (d->bmChannelConfig); + term->name = d->iTerminal; }return 0 ;case UAC_FEATURE_UNIT : {