From patchwork Thu Jul 26 02:31:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 949438 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="U/6JC4Bn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41bbkC4TRKz9ryl for ; Thu, 26 Jul 2018 12:33:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729083AbeGZDqc (ORCPT ); Wed, 25 Jul 2018 23:46:32 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38653 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729067AbeGZDqa (ORCPT ); Wed, 25 Jul 2018 23:46:30 -0400 Received: by mail-ed1-f68.google.com with SMTP id t2-v6so336694edr.5 for ; Wed, 25 Jul 2018 19:31:57 -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=z0/Zo1rLDSxi7qxt1pPuM8s6wHm2XpbvzzFP5iHNqfs=; b=U/6JC4BnzxMboPkLVBVavLCIqOlvOVi2NLv6lzFswodbBBUZYel/XEfZqUJBhNyfWK 5CJSB75qCxbY3Tpn4PGgKpFzs1STR9wHNPGou+F+rcGztfTh6guwfsJnebPnXb4rkLh/ d3UdEWMl5uix0XCbpQ5mig3cLOXM75vctMYsudNH5KQMWzU34ijo58bj5VnqnkDYOmA2 WlVPQjOy+UyIRS0DNZFnoBTy67u9SnQ2gu/008KLpvlk+4fDT6gqj0emRa9zTS4kTXF2 zU1tLEaU3r7Ljn1frneRGc44aagVtu0pW4Yscw46Kk7Aq0kLVb4ciJk3lgeera6klzCA IWwQ== 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=z0/Zo1rLDSxi7qxt1pPuM8s6wHm2XpbvzzFP5iHNqfs=; b=QCktqGc2vqvw6NnIiA9dau3QIKkxJRnH09PJRBwoIyvPCwQ9xnUoUbkLYUTeKLaMSy Uy5o8gKwe8tVz+bIs56fJl6oHsJvB96SNAbYTanU2v6yfPZAqKPS3GvkwB2Fxk8uggqb tiPmy3GBgxr6Iq98gLk61fpxK9zilPe4AHRPYbfHBja3fFxSCzU7hrUkEml5VlDel0D8 vToZUgHmx/MFR8mBY+gfGFMLP2LZ5UFRIX8VaxlEGll9+dNH6Eb1IjPFvc09Fktvlt4k OQYf6/5s5xPlUqWiNZm+zUZo/m4v8sZ/0MC8NdPHHU9h3bxBS4m1aAJ+OytZ3jENVk8H lBJg== X-Gm-Message-State: AOUpUlEoVQqmp/mBuh7/QH53U+Ar2/l1nwpjSJpDW9gktdSp4wqpGLG1 QtMkvetfdsyvzaJ1JDIYaG1gwg== X-Google-Smtp-Source: AAOMgpdJUeteyxV2p3f5r7V72YCr2yyBTkotDSofFXL8V7KvkYz+YnP7JZsWEwv3Ql14rPaMgCHkmQ== X-Received: by 2002:a50:c251:: with SMTP id t17-v6mr513489edf.108.1532572316829; Wed, 25 Jul 2018 19:31:56 -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.31.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jul 2018 19:31:56 -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 09/18] xfrm: Dump usersa_info in compat/native formats Date: Thu, 26 Jul 2018 03:31:35 +0100 Message-Id: <20180726023144.31066-10-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 Create xfrm_usersa_info in netlink messages in 32/64-bit UABI according to type of syscall used to dump xfrm state. Cc: "David S. Miller" Cc: Herbert Xu Cc: Steffen Klassert Cc: netdev@vger.kernel.org Signed-off-by: Dmitry Safonov --- net/xfrm/xfrm_user.c | 55 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index b123e788488f..63622264a3a9 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -799,9 +799,9 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, return err; } -static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p) +static void __copy_to_user_state(struct xfrm_state *x, + struct xfrm_usersa_info_packed *p) { - memset(p, 0, sizeof(*p)); memcpy(&p->id, &x->id, sizeof(p->id)); memcpy(&p->sel, &x->sel, sizeof(p->sel)); memcpy(&p->lft, &x->lft, sizeof(p->lft)); @@ -818,11 +818,25 @@ static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p) p->seq = x->km.seq; } +static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p) +{ + memset(p, 0, sizeof(*p)); + __copy_to_user_state(x, (struct xfrm_usersa_info_packed *)p); +} + +static void copy_to_user_state_compat(struct xfrm_state *x, + struct xfrm_usersa_info_packed *p) +{ + memset(p, 0, sizeof(*p)); + __copy_to_user_state(x, p); +} + struct xfrm_dump_info { struct sk_buff *in_skb; struct sk_buff *out_skb; u32 nlmsg_seq; u16 nlmsg_flags; + bool compat_dump; }; static int copy_sec_ctx(struct xfrm_sec_ctx *s, struct sk_buff *skb) @@ -882,14 +896,10 @@ static int copy_to_user_auth(struct xfrm_algo_auth *auth, struct sk_buff *skb) } /* Don't change this without updating xfrm_sa_len! */ -static int copy_to_user_state_extra(struct xfrm_state *x, - struct xfrm_usersa_info *p, - struct sk_buff *skb) +static int __copy_to_user_state_extra(struct xfrm_state *x, struct sk_buff *skb) { int ret = 0; - copy_to_user_state(x, p); - if (x->props.extra_flags) { ret = nla_put_u32(skb, XFRMA_SA_EXTRA_FLAGS, x->props.extra_flags); @@ -968,23 +978,42 @@ static int copy_to_user_state_extra(struct xfrm_state *x, return ret; } +static int copy_to_user_state_extra(struct xfrm_state *x, + struct xfrm_usersa_info *p, struct sk_buff *skb) +{ + copy_to_user_state(x, p); + return __copy_to_user_state_extra(x, skb); +} + +static int copy_to_user_state_extra_compat(struct xfrm_state *x, + struct xfrm_usersa_info_packed *p, struct sk_buff *skb) +{ + copy_to_user_state_compat(x, p); + return __copy_to_user_state_extra(x, skb); +} + static int dump_one_state(struct xfrm_state *x, int count, void *ptr) { struct xfrm_dump_info *sp = ptr; struct sk_buff *in_skb = sp->in_skb; struct sk_buff *skb = sp->out_skb; - struct xfrm_usersa_info *p; struct nlmsghdr *nlh; + size_t msg_len; int err; + if (sp->compat_dump) + msg_len = sizeof(struct xfrm_usersa_info_packed); + else + msg_len = sizeof(struct xfrm_usersa_info); nlh = nlmsg_put(skb, NETLINK_CB(in_skb).portid, sp->nlmsg_seq, - XFRM_MSG_NEWSA, sizeof(*p), sp->nlmsg_flags); + XFRM_MSG_NEWSA, msg_len, sp->nlmsg_flags); if (nlh == NULL) return -EMSGSIZE; - p = nlmsg_data(nlh); - - err = copy_to_user_state_extra(x, p, skb); + if (sp->compat_dump) + err = copy_to_user_state_extra_compat(x, nlmsg_data(nlh), skb); + else + err = copy_to_user_state_extra(x, nlmsg_data(nlh), skb); if (err) { nlmsg_cancel(skb, nlh); return err; @@ -1018,6 +1047,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb) info.out_skb = skb; info.nlmsg_seq = cb->nlh->nlmsg_seq; info.nlmsg_flags = NLM_F_MULTI; + info.compat_dump = in_compat_syscall(); if (!cb->args[0]) { struct nlattr *attrs[XFRMA_MAX+1]; @@ -1064,6 +1094,7 @@ static struct sk_buff *xfrm_state_netlink(struct sk_buff *in_skb, info.out_skb = skb; info.nlmsg_seq = seq; info.nlmsg_flags = 0; + info.compat_dump = in_compat_syscall(); err = dump_one_state(x, 0, &info); if (err) {