| Message ID | 1420644676-29863-1-git-send-email-o-takashi@sakamocchi.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 92cb46584e104e2f4b14a44959109ffe13524a26 |
| Headers | show |
At Thu, 8 Jan 2015 00:31:16 +0900, Takashi Sakamoto wrote: > > Although the 't->length' is a big-endian value, it's used without any > conversion. This means that the driver always uses 'length' parameter. > > Fixes: 555e8a8f7f14("ALSA: fireworks: Add command/response functionality into hwdep interface") > Reported-by: Clemens Ladisch <clemens@ladisch.de> > Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Applied, thanks. Takashi > --- > sound/firewire/fireworks/fireworks_transaction.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/firewire/fireworks/fireworks_transaction.c b/sound/firewire/fireworks/fireworks_transaction.c > index 255dabc..2a85e42 100644 > --- a/sound/firewire/fireworks/fireworks_transaction.c > +++ b/sound/firewire/fireworks/fireworks_transaction.c > @@ -124,7 +124,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode) > spin_lock_irq(&efw->lock); > > t = (struct snd_efw_transaction *)data; > - length = min_t(size_t, t->length * sizeof(t->length), length); > + length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length); > > if (efw->push_ptr < efw->pull_ptr) > capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr); > -- > 2.1.0 >
diff --git a/sound/firewire/fireworks/fireworks_transaction.c b/sound/firewire/fireworks/fireworks_transaction.c index 255dabc..2a85e42 100644 --- a/sound/firewire/fireworks/fireworks_transaction.c +++ b/sound/firewire/fireworks/fireworks_transaction.c @@ -124,7 +124,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode) spin_lock_irq(&efw->lock); t = (struct snd_efw_transaction *)data; - length = min_t(size_t, t->length * sizeof(t->length), length); + length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length); if (efw->push_ptr < efw->pull_ptr) capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr);
Although the 't->length' is a big-endian value, it's used without any conversion. This means that the driver always uses 'length' parameter. Fixes: 555e8a8f7f14("ALSA: fireworks: Add command/response functionality into hwdep interface") Reported-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> --- sound/firewire/fireworks/fireworks_transaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)