lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 223/254] ipv6: fix IPV6_PKTINFO with v4 mapped
    Date
    3.16.7-ckt2 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit 5337b5b75cd9bd3624a6820e3c2a084d2480061c upstream.

    Use IS_ENABLED(CONFIG_IPV6), to enable this code if IPv6 is
    a module.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Fixes: c8e6ad0829a7 ("ipv6: honor IPV6_PKTINFO with v4 mapped addresses on sendmsg")
    Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/ipv4/ip_sockglue.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
    index 64741b938632..94f1f15cf834 100644
    --- a/net/ipv4/ip_sockglue.c
    +++ b/net/ipv4/ip_sockglue.c
    @@ -195,7 +195,7 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc,
    for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
    if (!CMSG_OK(msg, cmsg))
    return -EINVAL;
    -#if defined(CONFIG_IPV6)
    +#if IS_ENABLED(CONFIG_IPV6)
    if (allow_ipv6 &&
    cmsg->cmsg_level == SOL_IPV6 &&
    cmsg->cmsg_type == IPV6_PKTINFO) {
    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-25 12:21    [W:4.456 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site