From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761491Ab0J1UDp (ORCPT ); Thu, 28 Oct 2010 16:03:45 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:41880 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933592Ab0J1UCN (ORCPT ); Thu, 28 Oct 2010 16:02:13 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=PF+NucNyVfeeV+KSMkrIDxJNAWAdwL1qWqKvYnOMH1krYOi5alttCtxrpL/fleBD8l JPyExi18dmPzLZkot45lEVBoFmura57nY5UE/P0Iz70kNC+UUDc47t/41rSS2QG8pUwt iIZsEv20UMu31LV6yjFLdAX9UCggWCp9mQivY= From: Vasiliy Kulikov To: kernel-janitors@vger.kernel.org Cc: Greg Kroah-Hartman , Tejun Heo , Arnd Bergmann , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: dream: fix information leak to userland Date: Fri, 29 Oct 2010 00:02:07 +0400 Message-Id: <1288296128-19257-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Structure msm_audio_stats is copied to userland with some fields unitialized. It leads to leaking of contents of kernel stack memory. Also struct msm_audio_config has field "unused" of type array of 3 elements, not 4. Instead of this, initialize field "type". Signed-off-by: Vasiliy Kulikov --- drivers/staging/dream/qdsp5/audio_qcelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/staging/dream/qdsp5/audio_qcelp.c b/drivers/staging/dream/qdsp5/audio_qcelp.c index 911bab4..0ffc870 100644 --- a/drivers/staging/dream/qdsp5/audio_qcelp.c +++ b/drivers/staging/dream/qdsp5/audio_qcelp.c @@ -478,6 +478,7 @@ static long audqcelp_ioctl(struct file *file, unsigned int cmd, if (cmd == AUDIO_GET_STATS) { struct msm_audio_stats stats; + memset(&stats, 0, sizeof(stats)); stats.byte_count = audpp_avsync_byte_count(audio->dec_id); stats.sample_count = audpp_avsync_sample_count(audio->dec_id); if (copy_to_user((void *)arg, &stats, sizeof(stats))) @@ -529,10 +530,10 @@ static long audqcelp_ioctl(struct file *file, unsigned int cmd, config.buffer_count = BUF_COUNT; config.sample_rate = 8000; config.channel_count = 1; + config.type = 0; config.unused[0] = 0; config.unused[1] = 0; config.unused[2] = 0; - config.unused[3] = 0; if (copy_to_user((void *)arg, &config, sizeof(config))) rc = -EFAULT; -- 1.7.0.4