Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA2CBC43381 for ; Mon, 1 Apr 2019 10:09:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A91932087F for ; Mon, 1 Apr 2019 10:09:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hz+G5dVV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726396AbfDAKJc (ORCPT ); Mon, 1 Apr 2019 06:09:32 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:52511 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfDAKJc (ORCPT ); Mon, 1 Apr 2019 06:09:32 -0400 Received: by mail-pl1-f201.google.com with SMTP id d33so7126940pla.19 for ; Mon, 01 Apr 2019 03:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=sHAYyAMp/0p2RUa5fIHocaSqOpuS/mYTM5IHmK/tt+E=; b=hz+G5dVVtii/rv800J12N7etNe29e1GH6sE0YTNu4Xzq0yM/VaLSAzdkxOfgdFccTF x+poGSGephTEOdsDdzUITJPsUxkV55Kyn1X45MnyVIgh6KEe2GxgaPiG07Nq/7OrhlfR 3VBJykGnUf/qVuCWMKxTJ314IQFsI3xyJ7ThG9UPZzb0tnue1Z5vWOY5RKDrTZL6AyOK yk9Lwrx52oYWm3qaecD5PlUXME7robF5pu8ozLidhJMIL6a2Qflrt3flggNzqGif5Oe2 AetZWNTWL+36U8KTtJeAQwt7WU7JGxdAUQXiQtvlN0IJFAalHnPcJNYFkNOsyEw1u20F +GAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=sHAYyAMp/0p2RUa5fIHocaSqOpuS/mYTM5IHmK/tt+E=; b=VkKWVHVXWoDgAFK+wJ+NGPTKikfwmgOHebW8IZ0qpH/kO3X102DtSsn4bVkHgQgEgD h3SDnxiESlSA3uNHxWRmR6dTeq8VLsxf5krF0vPh15JrCCShhaMHfVaWqEQUK+WBVpi5 1cn+SeWF4d6Y9EGaphz75ka49GjRbUYhIvOzlP7Wpr/+ssrcvNEZpEg3hCIJhZG5nqtM DQ4N9V/c4iQghdZCmqPF+aab1mSSCImSrcqlOFyF5Wwxfs6r9dZZzqjzS7aEyVPZ1Kfm wgx7bAYWqlUSfgMuh85cuTXnMELQ0aR7pslkeMb0juipkAIQeHw0BpEsbAmzu8g+g2Jo GQ+Q== X-Gm-Message-State: APjAAAU8xkRoX2z2VXlbPeelLSDih54yJHLvYw5XI5gdrDrP6nH7stc8 TtQ06WzLaZgn6/DGraFFfXPs9cv8lXMzJQ== X-Google-Smtp-Source: APXvYqwoNGkp9WhcfZeyt3E0PThJrgrfcWkpx3W8b+P3ON8opkWubFSw4m6zbh/+7a0HwvRuUusJBtR2IMWMmg== X-Received: by 2002:a62:5304:: with SMTP id h4mr1084558pfb.38.1554113370810; Mon, 01 Apr 2019 03:09:30 -0700 (PDT) Date: Mon, 1 Apr 2019 03:09:20 -0700 Message-Id: <20190401100920.42508-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH net] tcp: fix tcp_inet6_sk() for 32bit kernels From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , Julian Anastasov Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It turns out that struct ipv6_pinfo is not located as we think. inet6_sk_generic() and tcp_inet6_sk() disagree on 32bit kernels by 4-bytes, because struct tcp_sock has 8-bytes alignment, but ipv6_pinfo size is not a multiple of 8. sizeof(struct ipv6_pinfo): 116 (not padded to 8) I actually first coded tcp_inet6_sk() as this patch does, but thought that "container_of(tcp_sk(sk), struct tcp6_sock, tcp)" was cleaner. As Julian told me : Nobody should use tcp6_sock.inet6 directly, it should be accessed via tcp_inet6_sk() or inet6_sk(). This happened when we added the first u64 field in struct tcp_sock. Fixes: 93a77c11ae79 ("tcp: add tcp_inet6_sk() helper") Signed-off-by: Eric Dumazet Bisected-by: Julian Anastasov --- net/ipv6/tcp_ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index eec814fe53b817106bc1d1eaa89dadcb96c974fa..82018bdce863165eba72e1ccf0c12ee558042ae8 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -93,12 +93,13 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk, /* Helper returning the inet6 address from a given tcp socket. * It can be used in TCP stack instead of inet6_sk(sk). * This avoids a dereference and allow compiler optimizations. + * It is a specialized version of inet6_sk_generic(). */ static struct ipv6_pinfo *tcp_inet6_sk(const struct sock *sk) { - struct tcp6_sock *tcp6 = container_of(tcp_sk(sk), struct tcp6_sock, tcp); + unsigned int offset = sizeof(struct tcp6_sock) - sizeof(struct ipv6_pinfo); - return &tcp6->inet6; + return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) -- 2.21.0.392.gf8f6787159e-goog