From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
To: Dan Carpenter <dan.carpenter@oracle.com>, Jeff Dike <jdike@addtoit.com>
Cc: Song Liu <songliubraving@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
kernel-janitors@vger.kernel.org,
Richard Weinberger <richard@nod.at>,
linux-um@lists.infradead.org, Alexei Starovoitov <ast@kernel.org>,
Yonghong Song <yhs@fb.com>, Alex Dewar <alex.dewar@gmx.co.uk>,
bpf@vger.kernel.org, Andrii Nakryiko <andriin@fb.com>,
Martin KaFai Lau <kafai@fb.com>
Subject: Re: [PATCH] um: Fix some error handling in uml_vector_user_bpf()
Date: Fri, 24 Jan 2020 12:52:18 +0000 [thread overview]
Message-ID: <36070c96-8e75-7d06-d945-87a9d366d0b9@cambridgegreys.com> (raw)
In-Reply-To: <20200124101450.jxfzsh6sz7v324hv@kili.mountain>
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 <dan.carpenter@oracle.com>
> ---
> 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
next prev parent reply other threads:[~2020-01-24 13:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 10:14 [PATCH] um: Fix some error handling in uml_vector_user_bpf() Dan Carpenter
2020-01-24 12:52 ` Anton Ivanov [this message]
2020-01-24 16:44 ` Dan Carpenter
2020-01-24 16:48 ` Anton Ivanov
2020-01-25 6:01 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36070c96-8e75-7d06-d945-87a9d366d0b9@cambridgegreys.com \
--to=anton.ivanov@cambridgegreys.com \
--cc=alex.dewar@gmx.co.uk \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=daniel@iogearbox.net \
--cc=jdike@addtoit.com \
--cc=kafai@fb.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=richard@nod.at \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox