Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 6 Mar 2022 18:28:47 +0100
From:   Jiri Olsa <olsajiri@gmail.com>
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc:     Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@chromium.org>,
        Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [PATCH 02/10] bpf: Add multi kprobe link
Message-ID: <YiTvT0nyWLDvFya+@krava>
References: <20220222170600.611515-1-jolsa@kernel.org>
 <20220222170600.611515-3-jolsa@kernel.org>
 <CAEf4BzadsmOTas7BdF-J+de7AqsoccY1o6e0pUBkRuWH+53DiQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAEf4BzadsmOTas7BdF-J+de7AqsoccY1o6e0pUBkRuWH+53DiQ@mail.gmail.com>
Precedence: bulk

On Fri, Mar 04, 2022 at 03:11:01PM -0800, Andrii Nakryiko wrote:

SNIP

> > +static int
> > +kprobe_multi_resolve_syms(const void *usyms, u32 cnt,
> > +                         unsigned long *addrs)
> > +{
> > +       unsigned long addr, size;
> > +       const char **syms;
> > +       int err = -ENOMEM;
> > +       unsigned int i;
> > +       char *func;
> > +
> > +       size = cnt * sizeof(*syms);
> > +       syms = kvzalloc(size, GFP_KERNEL);
> > +       if (!syms)
> > +               return -ENOMEM;
> > +
> > +       func = kmalloc(KSYM_NAME_LEN, GFP_KERNEL);
> > +       if (!func)
> > +               goto error;
> > +
> > +       if (copy_from_user(syms, usyms, size)) {
> > +               err = -EFAULT;
> > +               goto error;
> > +       }
> > +
> > +       for (i = 0; i < cnt; i++) {
> > +               err = strncpy_from_user(func, syms[i], KSYM_NAME_LEN);
> > +               if (err == KSYM_NAME_LEN)
> > +                       err = -E2BIG;
> > +               if (err < 0)
> > +                       goto error;
> > +
> > +               err = -EINVAL;
> > +               if (func[0] == '\0')
> > +                       goto error;
> 
> wouldn't empty string be handled by kallsyms_lookup_name?

it would scan and compare all symbols with empty string,
so it's better to test for it

jirka

> 
> > +               addr = kallsyms_lookup_name(func);
> > +               if (!addr)
> > +                       goto error;
> > +               if (!kallsyms_lookup_size_offset(addr, &size, NULL))
> > +                       size = MCOUNT_INSN_SIZE;
> > +               addr = ftrace_location_range(addr, addr + size - 1);
> > +               if (!addr)
> > +                       goto error;
> > +               addrs[i] = addr;
> > +       }
> > +
> > +       err = 0;
> > +error:
> > +       kvfree(syms);
> > +       kfree(func);
> > +       return err;
> > +}
> > +
> 
> [...]