Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756817Ab0G2Kbv (ORCPT ); Thu, 29 Jul 2010 06:31:51 -0400 Received: from cantor.suse.de ([195.135.220.2]:38041 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756676Ab0G2Kbs (ORCPT ); Thu, 29 Jul 2010 06:31:48 -0400 Date: Thu, 29 Jul 2010 12:31:46 +0200 Message-ID: From: Takashi Iwai To: Kulikov Vasiliy Cc: kernel-janitors@vger.kernel.org, Jaroslav Kysela , Eliot Blennerhassett , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 10/10] ALSA: asihpi: check return value of get_user() In-Reply-To: <1280335316-23515-1-git-send-email-segooon@gmail.com> References: <1280335316-23515-1-git-send-email-segooon@gmail.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1958 Lines: 61 At Wed, 28 Jul 2010 20:41:56 +0400, Kulikov Vasiliy wrote: > > get_user() may fail, if so return -EFAULT. > > Signed-off-by: Kulikov Vasiliy Thanks, applied this one, too. Takashi > --- > sound/pci/asihpi/hpioctl.c | 17 +++++++++++++---- > 1 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c > index 3114999..62895a7 100644 > --- a/sound/pci/asihpi/hpioctl.c > +++ b/sound/pci/asihpi/hpioctl.c > @@ -121,11 +121,17 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg; > > /* Read the message and response pointers from user space. */ > - get_user(puhm, &phpi_ioctl_data->phm); > - get_user(puhr, &phpi_ioctl_data->phr); > + if (get_user(puhm, &phpi_ioctl_data->phm) || > + get_user(puhr, &phpi_ioctl_data->phr)) { > + err = -EFAULT; > + goto out; > + } > > /* Now read the message size and data from user space. */ > - get_user(hm->h.size, (u16 __user *)puhm); > + if (get_user(hm->h.size, (u16 __user *)puhm)) { > + err = -EFAULT; > + goto out; > + } > if (hm->h.size > sizeof(*hm)) > hm->h.size = sizeof(*hm); > > @@ -138,7 +144,10 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > goto out; > } > > - get_user(res_max_size, (u16 __user *)puhr); > + if (get_user(res_max_size, (u16 __user *)puhr)) { > + err = -EFAULT; > + goto out; > + } > /* printk(KERN_INFO "user response size %d\n", res_max_size); */ > if (res_max_size < sizeof(struct hpi_response_header)) { > HPI_DEBUG_LOG(WARNING, "small res size %d\n", res_max_size); > -- > 1.7.0.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/