|
@@ -30,6 +30,7 @@
|
|
|
#include <linux/math64.h>
|
|
#include <linux/math64.h>
|
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/vmalloc.h>
|
|
|
#include <linux/io.h>
|
|
#include <linux/io.h>
|
|
|
|
|
+#include <linux/nospec.h>
|
|
|
|
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/core.h>
|
|
|
#include <sound/control.h>
|
|
#include <sound/control.h>
|
|
@@ -4092,15 +4093,16 @@ static int snd_hdsp_channel_info(struct snd_pcm_substream *substream,
|
|
|
struct snd_pcm_channel_info *info)
|
|
struct snd_pcm_channel_info *info)
|
|
|
{
|
|
{
|
|
|
struct hdsp *hdsp = snd_pcm_substream_chip(substream);
|
|
struct hdsp *hdsp = snd_pcm_substream_chip(substream);
|
|
|
- int mapped_channel;
|
|
|
|
|
|
|
+ unsigned int channel = info->channel;
|
|
|
|
|
|
|
|
- if (snd_BUG_ON(info->channel >= hdsp->max_channels))
|
|
|
|
|
|
|
+ if (snd_BUG_ON(channel >= hdsp->max_channels))
|
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
+ channel = array_index_nospec(channel, hdsp->max_channels);
|
|
|
|
|
|
|
|
- if ((mapped_channel = hdsp->channel_map[info->channel]) < 0)
|
|
|
|
|
|
|
+ if (hdsp->channel_map[channel] < 0)
|
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
- info->offset = mapped_channel * HDSP_CHANNEL_BUFFER_BYTES;
|
|
|
|
|
|
|
+ info->offset = hdsp->channel_map[channel] * HDSP_CHANNEL_BUFFER_BYTES;
|
|
|
info->first = 0;
|
|
info->first = 0;
|
|
|
info->step = 32;
|
|
info->step = 32;
|
|
|
return 0;
|
|
return 0;
|