[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit c497eb31e4d7539107b8f834b500f7be95aab8fe
Author: Ofer Heifetz <oferh at marvell.com>
Date:   Mon May 30 14:26:19 2016 -0400

    KLIPS: fix sk pointer usage for key_pid
    
    Up till linux kernel 4.1, key_pid was saved into sk_proinfo, this field
    was removed and KLIPS was changed to save the key_pid into the sk pointer
    which crashed the kernel. This patch fixes this issue by saving the
    key_pid into sk->sk_user_data.
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>