OSDN Git Service

ALSA: oxfw: remove an unnecessary condition in hwdep_read()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 25 Jan 2021 11:12:54 +0000 (14:12 +0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 25 Jan 2021 13:50:07 +0000 (14:50 +0100)
Smatch complains that "count" isn't clamped properly and
"oxfw->dev_lock_changed" is false then it leads to an information
leak.  But it turns out that "oxfw->dev_lock_changed" is always
set and the condition can be removed.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/YA6ntkBxT/4DJ4YK@mwanda
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/oxfw/oxfw-hwdep.c

index 9e1b3e1..a0fe996 100644 (file)
@@ -35,13 +35,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,  long count,
        }
 
        memset(&event, 0, sizeof(event));
-       if (oxfw->dev_lock_changed) {
-               event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;
-               event.lock_status.status = (oxfw->dev_lock_count > 0);
-               oxfw->dev_lock_changed = false;
+       event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;
+       event.lock_status.status = (oxfw->dev_lock_count > 0);
+       oxfw->dev_lock_changed = false;
 
-               count = min_t(long, count, sizeof(event.lock_status));
-       }
+       count = min_t(long, count, sizeof(event.lock_status));
 
        spin_unlock_irq(&oxfw->lock);