From patchwork Thu Jul 26 02:31:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 949429 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.b="Bv++vz/G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41bbhm6zHmz9s4r for ; Thu, 26 Jul 2018 12:32:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729435AbeGZDqh (ORCPT ); Wed, 25 Jul 2018 23:46:37 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42576 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbeGZDqh (ORCPT ); Wed, 25 Jul 2018 23:46:37 -0400 Received: by mail-ed1-f65.google.com with SMTP id r4-v6so327656edp.9 for ; Wed, 25 Jul 2018 19:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1lJb2Xgk8XeoJi527HTQMfXBx4RnBCtj+CFeFlu3zoM=; b=Bv++vz/GESBtRPNgCCKHpg6Xh3cDuuQs8KocTF+BoOeY3v+Bx6w/KUvMnwupir0eun pG5a5ULvNUHqZImP7AFDTbdxma5C7OPjcbd1+lKy8D2UtB2B3wEJXqVvH8tkp8EgIaC1 XwKqUDWG2XV/Fvh4oryMY6Cj/UcwOCcTOnz5mQ5Ele2BTCJu1a9xQUPVrj+S/eC7Yx7v mWzHg7EZooYyBdqS7Tz9ihLKWnqOIltxOg02xLaTmjkDHZdeJaf25wDaj1sq9FpbC5ac jemaeo41id8SBDgEF0H1NoMCJa1ssnaEZ9cBdjyKU7d5CIt3+MEplxIhWqjDK/tBMM+3 xBbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1lJb2Xgk8XeoJi527HTQMfXBx4RnBCtj+CFeFlu3zoM=; b=Nx/Blg5nbi0PKKyOnD/eMRJKeKjARYtVH2hcXZORuuzcxjvlDQxYDJsjjXj/P6o3Bk WZnd4l4iV5JCwgIoyAQsQBAeyEGxkseyUGxfhweNxzHOUAshPXje79t8V/PjMeoBJEyk JhI5bBWu2hW1SgIuDN+f91Ch4rh45svmZKB6jhTu8YbiJS9EYLhMBHzudRByTbHzTLFh Pi1EhoWhQZgFE2ZruqsjhXEUGECvDdB24FgXwZanfWrdOKP8qoKc03S5a+avbrbSfXHz aLmQ381wGkkkZQWIrLkAHr4kpOy6AL2HUoHikX5yE38/5oanMGItI4g5bxnEbxfKiZCd /Fsw== X-Gm-Message-State: AOUpUlHVkxC9XbfKvgA+Gq5gEYJHb0CRURS9MxItz4/yfu1WZ978U+9S NJIEwwpFvMjDNms7eQEtpnMzRw== X-Google-Smtp-Source: AAOMgpfOz4nbJFpMROISGgUI776G4g+ZHIUkE6QHLmpIFO6dEcJT+YNfdonzBvheejiCWBpphpWQGw== X-Received: by 2002:a50:a7e2:: with SMTP id i89-v6mr493394edc.176.1532572323756; Wed, 25 Jul 2018 19:32:03 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id x13-v6sm241024edx.17.2018.07.25.19.32.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jul 2018 19:32:03 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov , "David S. Miller" , Herbert Xu , Steffen Klassert , Dmitry Safonov <0x7f454c46@gmail.com>, netdev@vger.kernel.org Subject: [PATCH 15/18] xfrm: Check compat acquire listeners in xfrm_is_alive() Date: Thu, 26 Jul 2018 03:31:41 +0100 Message-Id: <20180726023144.31066-16-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180726023144.31066-1-dima@arista.com> References: <20180726023144.31066-1-dima@arista.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As now there are two groups of listeners: XFRMNLGRP_ACQUIRE - applications that uses native UABI for messages; XFRMNLGRP_COMPAT_ACQUIRE - applications that uses compat UABI for messages; So, both groups should be checked for listeners of acquire notifications. Cc: "David S. Miller" Cc: Herbert Xu Cc: Steffen Klassert Cc: netdev@vger.kernel.org Signed-off-by: Dmitry Safonov --- include/net/xfrm.h | 14 -------------- net/xfrm/xfrm_user.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 557122846e0e..c9b713017ae8 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1784,20 +1784,6 @@ static inline int xfrm_aevent_is_on(struct net *net) rcu_read_unlock(); return ret; } - -static inline int xfrm_acquire_is_on(struct net *net) -{ - struct sock *nlsk; - int ret = 0; - - rcu_read_lock(); - nlsk = rcu_dereference(net->xfrm.nlsk); - if (nlsk) - ret = netlink_has_listeners(nlsk, XFRMNLGRP_ACQUIRE); - rcu_read_unlock(); - - return ret; -} #endif static inline unsigned int aead_len(struct xfrm_algo_aead *alg) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 2fe6174b8a18..752019963b1e 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -3517,6 +3517,22 @@ static int xfrm_send_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_MAPPING); } +static inline int xfrm_acquire_is_on(struct net *net) +{ + struct sock *nlsk; + int ret = 0; + + rcu_read_lock(); + nlsk = rcu_dereference(net->xfrm.nlsk); + if (nlsk) + ret = netlink_has_listeners(nlsk, XFRMNLGRP_ACQUIRE); + if (!ret || IS_ENABLED(CONFIG_COMPAT)) + ret = netlink_has_listeners(nlsk, XFRMNLGRP_COMPAT_ACQUIRE); + rcu_read_unlock(); + + return ret; +} + static bool xfrm_is_alive(const struct km_event *c) { return (bool)xfrm_acquire_is_on(c->net);