lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 107/144] bpf: fix references to free_bpf_prog_info() in comments
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jakub Kicinski <jakub.kicinski@netronome.com>

    [ Upstream commit ab7f5bf0928be2f148d000a6eaa6c0a36e74750e ]

    Comments in the verifier refer to free_bpf_prog_info() which
    seems to have never existed in tree. Replace it with
    free_used_maps().

    Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/bpf/verifier.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/kernel/bpf/verifier.c
    +++ b/kernel/bpf/verifier.c
    @@ -3225,7 +3225,7 @@ static int replace_map_fd_with_map_ptr(s
    /* hold the map. If the program is rejected by verifier,
    * the map will be released by release_maps() or it
    * will be used by the valid program until it's unloaded
    - * and all maps are released in free_bpf_prog_info()
    + * and all maps are released in free_used_maps()
    */
    map = bpf_map_inc(map, false);
    if (IS_ERR(map)) {
    @@ -3629,7 +3629,7 @@ free_log_buf:
    vfree(log_buf);
    if (!env->prog->aux->used_maps)
    /* if we didn't copy map pointers into bpf_prog_info, release
    - * them now. Otherwise free_bpf_prog_info() will release them.
    + * them now. Otherwise free_used_maps() will release them.
    */
    release_maps(env);
    *prog = env->prog;

    \
     
     \ /
      Last update: 2018-08-01 19:33    [W:4.062 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site