Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab1d7a3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm8x16-wcd: prevent out of bounds access"

parents 3847e62c 9f4df258

sound/soc/codecs/msm8x16-wcd.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3468,7 +3468,7 @@ static int msm8x16_wcd_codec_enable_micbias(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec, micb_int_reg, 0x08, 0x08);

			msm8x16_notifier_call(codec,

					WCD_EVENT_POST_MICBIAS_2_ON);

		} else if (strnstr(w->name, internal3_text, 30)) {

		} else if (strnstr(w->name, internal3_text, strlen(w->name))) {

			snd_soc_update_bits(codec, micb_int_reg, 0x01, 0x01);

		} else if (strnstr(w->name, external2_text, strlen(w->name))) {

			msm8x16_notifier_call(codec,
@@ -3481,7 +3481,7 @@ static int msm8x16_wcd_codec_enable_micbias(struct snd_soc_dapm_widget *w, 
		} else if (strnstr(w->name, internal2_text, strlen(w->name))) {

			msm8x16_notifier_call(codec,

					WCD_EVENT_POST_MICBIAS_2_OFF);

		} else if (strnstr(w->name, internal3_text, 30)) {

		} else if (strnstr(w->name, internal3_text, strlen(w->name))) {

			snd_soc_update_bits(codec, micb_int_reg, 0x2, 0x0);

		} else if (strnstr(w->name, external2_text, strlen(w->name))) {

			/*