Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932641Ab1CWN7Z (ORCPT ); Wed, 23 Mar 2011 09:59:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34998 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932467Ab1CWN7Y (ORCPT ); Wed, 23 Mar 2011 09:59:24 -0400 Date: Wed, 23 Mar 2011 14:59:19 +0100 Message-ID: From: Takashi Iwai To: Dan Rosenberg Cc: perex@perex.cz, alsa-devel@alsa-project.org, security@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] sound/oss: remove offset from load_patch callbacks In-Reply-To: <1300888042.1968.7.camel@dan> References: <1300888042.1968.7.camel@dan> 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.2 (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: 1822 Lines: 52 At Wed, 23 Mar 2011 09:47:22 -0400, Dan Rosenberg wrote: > --- a/sound/oss/midi_synth.c > +++ b/sound/oss/midi_synth.c > @@ -508,16 +506,15 @@ midi_synth_load_patch(int dev, int format, const char __user *addr, > * been transferred already. > */ > > - if(copy_from_user(&((char *) &sysex)[offs], &(addr)[offs], hdr_size - offs)) > + if (copy_from_user(&sysex, addr, hdr_size)) Please correct the comment in the above as well. With this change, the transfer is no longer partial. > --- a/sound/oss/opl3.c > +++ b/sound/oss/opl3.c ... > @@ -834,7 +834,7 @@ static int opl3_load_patch(int dev, int format, const char __user *addr, > * What the fuck is going on here? We leave junk in the beginning > * of ins and then check the field pretty close to that beginning? > */ > - if(copy_from_user(&((char *) &ins)[offs], addr + offs, sizeof(ins) - offs)) > + if (copy_from_user(&ins, addr, sizeof(ins))) Ditto. > return -EFAULT; > > if (ins.channel < 0 || ins.channel >= SBFM_MAXINSTR) > diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c > index 5ea1098..2e842cb 100644 > --- a/sound/oss/sequencer.c > +++ b/sound/oss/sequencer.c > @@ -241,7 +241,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun > return -ENXIO; > > fmt = (*(short *) &event_rec[0]) & 0xffff; > - err = synth_devs[dev]->load_patch(dev, fmt, buf, p + 4, c, 0); > + err = synth_devs[dev]->load_patch(dev, fmt, buf, c, 0); The address must be "buf + p + 4" instead of "buf", when you omit the offset argument. thanks, Takashi -- 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/