|
@@ -21,6 +21,7 @@
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/compat.h>
|
|
|
+#include <linux/nospec.h>
|
|
|
#include <sound/core.h>
|
|
|
#include "hda_codec.h"
|
|
|
#include "hda_local.h"
|
|
@@ -51,7 +52,16 @@ static int get_wcap_ioctl(struct hda_codec *codec,
|
|
|
|
|
|
if (get_user(verb, &arg->verb))
|
|
|
return -EFAULT;
|
|
|
- res = get_wcaps(codec, verb >> 24);
|
|
|
+ /* open-code get_wcaps(verb>>24) with nospec */
|
|
|
+ verb >>= 24;
|
|
|
+ if (verb < codec->core.start_nid ||
|
|
|
+ verb >= codec->core.start_nid + codec->core.num_nodes) {
|
|
|
+ res = 0;
|
|
|
+ } else {
|
|
|
+ verb -= codec->core.start_nid;
|
|
|
+ verb = array_index_nospec(verb, codec->core.num_nodes);
|
|
|
+ res = codec->wcaps[verb];
|
|
|
+ }
|
|
|
if (put_user(res, &arg->res))
|
|
|
return -EFAULT;
|
|
|
return 0;
|