From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933984AbbA1EUS (ORCPT ); Tue, 27 Jan 2015 23:20:18 -0500 Received: from mail.kernel.org ([198.145.29.136]:39148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761634AbbA1EUO (ORCPT ); Tue, 27 Jan 2015 23:20:14 -0500 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Xiubo Li , Mark Brown , Zefan Li Subject: [PATCH 3.4 70/91] ASoC: core: fix possible ZERO_SIZE_PTR pointer dereferencing error. Date: Wed, 28 Jan 2015 12:08:26 +0800 Message-Id: <1422418236-12852-139-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422418050-12581-1-git-send-email-lizf@kernel.org> References: <1422418050-12581-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiubo Li 3.4.105-rc1 review patch. If anyone has any objections, please let me know. ------------------ commit 6596aa047b624aeec2ea321962cfdecf9953a383 upstream. Since we cannot make sure the 'params->num_regs' will always be none zero here, and then if it equals to zero, the kmemdup() will return ZERO_SIZE_PTR, which equals to ((void *)16). So this patch fix this with just doing the zero check before calling kmemdup(). Signed-off-by: Xiubo Li Signed-off-by: Mark Brown [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c88d974..34c1fbb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2799,7 +2799,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol, unsigned int val; void *data; - if (!codec->using_regmap) + if (!codec->using_regmap || !params->num_regs) return -EINVAL; data = ucontrol->value.bytes.data; -- 1.9.1