From: Vinod Koul Date: Wed, 3 Feb 2016 12:29:44 +0000 (+0530) Subject: ASoC: Intel: Skylake: Fix the memory overwrite of tlv buffer X-Git-Tag: v4.5-rc4~16^2~1^2~5^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41556f68d1dd0b6bbf311a220523b034d2a040e7;p=platform%2Fkernel%2Flinux-exynos.git ASoC: Intel: Skylake: Fix the memory overwrite of tlv buffer TLV buffer can be smaller than the module data, so update the size of data to be copied before doing the copy. Also TLV header consists of two unsigned ints, this is also taken into account here and size modified to reflect this Suggested-by: Takashi Iwai Signed-off-by: Vinod Koul Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index c7816d5..c67e3ac 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -916,6 +916,13 @@ static int skl_tplg_tlv_control_get(struct snd_kcontrol *kcontrol, skl_get_module_params(skl->skl_sst, (u32 *)bc->params, bc->max, bc->param_id, mconfig); + /* decrement size for TLV header */ + size -= 2 * sizeof(u32); + + /* check size as we don't want to send kernel data */ + if (size > bc->max) + size = bc->max; + if (bc->params) { if (copy_to_user(data, &bc->param_id, sizeof(u32))) return -EFAULT;