From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ivanoab7.miniserver.com ([37.128.132.42] helo=www.kot-begemot.co.uk) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iuytA-0003Ol-V8 for linux-um@lists.infradead.org; Fri, 24 Jan 2020 13:20:47 +0000 Subject: Re: [PATCH] um: Fix some error handling in uml_vector_user_bpf() References: <20200124101450.jxfzsh6sz7v324hv@kili.mountain> From: Anton Ivanov Message-ID: <36070c96-8e75-7d06-d945-87a9d366d0b9@cambridgegreys.com> Date: Fri, 24 Jan 2020 12:52:18 +0000 MIME-Version: 1.0 In-Reply-To: <20200124101450.jxfzsh6sz7v324hv@kili.mountain> Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: Dan Carpenter , Jeff Dike Cc: Song Liu , Daniel Borkmann , kernel-janitors@vger.kernel.org, Richard Weinberger , linux-um@lists.infradead.org, Alexei Starovoitov , Yonghong Song , Alex Dewar , bpf@vger.kernel.org, Andrii Nakryiko , Martin KaFai Lau On 24/01/2020 10:14, Dan Carpenter wrote: > 1) The uml_vector_user_bpf() returns pointers so it should return NULL > instead of false. > 2) If the "bpf_prog" allocation failed, it would have eventually lead to > a crash. We can't succeed after the error happens so it should just > return. > > Fixes: 9807019a62dc ("um: Loadable BPF "Firmware" for vector drivers") > Signed-off-by: Dan Carpenter > --- > arch/um/drivers/vector_user.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c > index ddcd917be0af..88483f5b034c 100644 > --- a/arch/um/drivers/vector_user.c > +++ b/arch/um/drivers/vector_user.c > @@ -732,13 +732,13 @@ void *uml_vector_user_bpf(char *filename) > > if (stat(filename, &statbuf) < 0) { > printk(KERN_ERR "Error %d reading bpf file", -errno); > - return false; > + return NULL; I will sort this one out, thanks for noticing. > } > bpf_prog = uml_kmalloc(sizeof(struct sock_fprog), UM_GFP_KERNEL); > - if (bpf_prog != NULL) { > - bpf_prog->len = statbuf.st_size / sizeof(struct sock_filter); > - bpf_prog->filter = NULL; > - } > + if (!pfg_prog) ^^^^^ ? > + return NULL; > + bpf_prog->len = statbuf.st_size / sizeof(struct sock_filter); > + bpf_prog->filter = NULL; > ffd = os_open_file(filename, of_read(OPENFLAGS()), 0); > if (ffd < 0) { > printk(KERN_ERR "Error %d opening bpf file", -errno); > -- Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 https://www.cambridgegreys.com/ _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um