From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B993C2D0DB for ; Fri, 24 Jan 2020 13:20:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5838720718 for ; Fri, 24 Jan 2020 13:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388798AbgAXNUn (ORCPT ); Fri, 24 Jan 2020 08:20:43 -0500 Received: from ivanoab7.miniserver.com ([37.128.132.42]:57830 "EHLO www.kot-begemot.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387722AbgAXNUn (ORCPT ); Fri, 24 Jan 2020 08:20:43 -0500 X-Greylist: delayed 1681 seconds by postgrey-1.27 at vger.kernel.org; Fri, 24 Jan 2020 08:20:43 EST Received: from tun252.jain.kot-begemot.co.uk ([192.168.18.6] helo=jain.kot-begemot.co.uk) by www.kot-begemot.co.uk with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iuyRn-0000J2-Hu; Fri, 24 Jan 2020 12:52:27 +0000 Received: from jain.kot-begemot.co.uk ([192.168.3.3]) by jain.kot-begemot.co.uk with esmtp (Exim 4.92) (envelope-from ) id 1iuyRf-0002ve-9o; Fri, 24 Jan 2020 12:52:24 +0000 Subject: Re: [PATCH] um: Fix some error handling in uml_vector_user_bpf() To: Dan Carpenter , Jeff Dike Cc: Song Liu , Daniel Borkmann , kernel-janitors@vger.kernel.org, Richard Weinberger , linux-um@lists.infradead.org, Alexei Starovoitov , Alex Dewar , Yonghong Song , bpf@vger.kernel.org, Andrii Nakryiko , Martin KaFai Lau 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 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200124101450.jxfzsh6sz7v324hv@kili.mountain> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Clacks-Overhead: GNU Terry Pratchett Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 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/