lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 247/344] randstruct: Check member structs in is_pure_ops_struct()
    Date
    From: Joonwon Kang <kjw1627@gmail.com>

    commit 60f2c82ed20bde57c362e66f796cf9e0e38a6dbb upstream.

    While no uses in the kernel triggered this case, it was possible to have
    a false negative where a struct contains other structs which contain only
    function pointers because of unreachable code in is_pure_ops_struct().

    Signed-off-by: Joonwon Kang <kjw1627@gmail.com>
    Link: https://lore.kernel.org/r/20190727155841.GA13586@host
    Fixes: 313dd1b62921 ("gcc-plugins: Add the randstruct plugin")
    Cc: stable@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    scripts/gcc-plugins/randomize_layout_plugin.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/scripts/gcc-plugins/randomize_layout_plugin.c
    +++ b/scripts/gcc-plugins/randomize_layout_plugin.c
    @@ -443,13 +443,13 @@ static int is_pure_ops_struct(const_tree
    if (node == fieldtype)
    continue;

    - if (!is_fptr(fieldtype))
    - return 0;
    -
    - if (code != RECORD_TYPE && code != UNION_TYPE)
    + if (code == RECORD_TYPE || code == UNION_TYPE) {
    + if (!is_pure_ops_struct(fieldtype))
    + return 0;
    continue;
    + }

    - if (!is_pure_ops_struct(fieldtype))
    + if (!is_fptr(fieldtype))
    return 0;
    }


    \
     
     \ /
      Last update: 2019-10-03 18:50    [W:2.957 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site