lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 323/329] netlabel: If PF_INET6, check sk_buff ip header version
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Richard Haines <richard_c_haines@btinternet.com>

    [ Upstream commit 213d7f94775322ba44e0bbb55ec6946e9de88cea ]

    When resolving a fallback label, check the sk_buff version as it
    is possible (e.g. SCTP) to have family = PF_INET6 while
    receiving ip_hdr(skb)->version = 4.

    Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
    Acked-by: Paul Moore <paul@paul-moore.com>
    Signed-off-by: Paul Moore <paul@paul-moore.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/netlabel/netlabel_unlabeled.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- a/net/netlabel/netlabel_unlabeled.c
    +++ b/net/netlabel/netlabel_unlabeled.c
    @@ -1469,6 +1469,16 @@ int netlbl_unlabel_getattr(const struct
    iface = rcu_dereference(netlbl_unlhsh_def);
    if (iface == NULL || !iface->valid)
    goto unlabel_getattr_nolabel;
    +
    +#if IS_ENABLED(CONFIG_IPV6)
    + /* When resolving a fallback label, check the sk_buff version as
    + * it is possible (e.g. SCTP) to have family = PF_INET6 while
    + * receiving ip_hdr(skb)->version = 4.
    + */
    + if (family == PF_INET6 && ip_hdr(skb)->version == 4)
    + family = PF_INET;
    +#endif /* IPv6 */
    +
    switch (family) {
    case PF_INET: {
    struct iphdr *hdr4;

    \
     
     \ /
      Last update: 2018-05-28 15:56    [W:7.003 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site