Netdev List
 help / color / mirror / Atom feed
From: Gao feng <gaofeng@cn.fujitsu.com>
To: davem@davemloft.net, eric.dumazet@gmail.com,
	steffen.klassert@secunet.com
Cc: netfilter-devel@vger.kernel.org, linux-rdma@vger.kernel.org,
	netdev@vger.kernel.org, linux-crypto@vger.kernel.org,
	pablo@netfilter.org, stephen.hemminger@vyatta.com,
	jengelh@inai.de, Gao feng <gaofeng@cn.fujitsu.com>
Subject: [patch v3 09/11] xfrm: pass xfrm_user module to netlink_dump_start
Date: Thu, 4 Oct 2012 12:41:27 +0800	[thread overview]
Message-ID: <1349325689-16104-9-git-send-email-gaofeng@cn.fujitsu.com> (raw)
In-Reply-To: <1349325689-16104-1-git-send-email-gaofeng@cn.fujitsu.com>

set netlink_dump_control.module to avoid panic.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
 net/xfrm/xfrm_user.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 421f984..3d909f7 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2308,17 +2308,20 @@ static struct xfrm_link {
 	int (*doit)(struct sk_buff *, struct nlmsghdr *, struct nlattr **);
 	int (*dump)(struct sk_buff *, struct netlink_callback *);
 	int (*done)(struct netlink_callback *);
+	struct module *module;
 } xfrm_dispatch[XFRM_NR_MSGTYPES] = {
 	[XFRM_MSG_NEWSA       - XFRM_MSG_BASE] = { .doit = xfrm_add_sa        },
 	[XFRM_MSG_DELSA       - XFRM_MSG_BASE] = { .doit = xfrm_del_sa        },
 	[XFRM_MSG_GETSA       - XFRM_MSG_BASE] = { .doit = xfrm_get_sa,
 						   .dump = xfrm_dump_sa,
-						   .done = xfrm_dump_sa_done  },
+						   .done = xfrm_dump_sa_done,
+						   .module = THIS_MODULE      },
 	[XFRM_MSG_NEWPOLICY   - XFRM_MSG_BASE] = { .doit = xfrm_add_policy    },
 	[XFRM_MSG_DELPOLICY   - XFRM_MSG_BASE] = { .doit = xfrm_get_policy    },
 	[XFRM_MSG_GETPOLICY   - XFRM_MSG_BASE] = { .doit = xfrm_get_policy,
 						   .dump = xfrm_dump_policy,
-						   .done = xfrm_dump_policy_done },
+						   .done = xfrm_dump_policy_done,
+						   .module = THIS_MODULE      },
 	[XFRM_MSG_ALLOCSPI    - XFRM_MSG_BASE] = { .doit = xfrm_alloc_userspi },
 	[XFRM_MSG_ACQUIRE     - XFRM_MSG_BASE] = { .doit = xfrm_add_acquire   },
 	[XFRM_MSG_EXPIRE      - XFRM_MSG_BASE] = { .doit = xfrm_add_sa_expire },
@@ -2362,6 +2365,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 			struct netlink_dump_control c = {
 				.dump = link->dump,
 				.done = link->done,
+				.module = link->module,
 			};
 			return netlink_dump_start(net->xfrm.nlsk, skb, nlh, &c);
 		}
-- 
1.7.7.6


  parent reply	other threads:[~2012-10-04  4:41 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-04  4:41 [patch v3 01/11] netlink: add reference of module in netlink_dump_start Gao feng
2012-10-04  4:41 ` [patch v3 02/11] inet_diag: pass inet_diag module to netlink_dump_start Gao feng
2012-10-04  5:08   ` Eric Dumazet
2012-10-04  8:03     ` Gao feng
2012-10-04  4:41 ` [patch v3 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink " Gao feng
2012-10-04  4:41 ` [patch v3 05/11] nfnetlink_acct: pass nfnetlink_acct " Gao feng
     [not found] ` <1349325689-16104-1-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-10-04  4:41   ` [patch v3 03/11] unix_diag: pass unix_diag " Gao feng
2012-10-04  4:41   ` [patch v3 06/11] nfnetlink_cthelper: pass nfnetlink_cthelper " Gao feng
2012-10-04  4:41   ` [patch v3 07/11] nfnetlink_cttimeout: pass nfnetlink_cttimeout " Gao feng
2012-10-04  4:41   ` [patch v3 11/11] infiniband: pass rdma_cm " Gao feng
2012-10-04  4:41 ` [patch v3 08/11] crypto: pass crypto_user " Gao feng
2012-10-04  4:41 ` Gao feng [this message]
2012-10-04  4:41 ` [patch v3 10/11] ipset: pass ipset " Gao feng
2012-10-04 15:41 ` [patch v3 01/11] netlink: add reference of module in netlink_dump_start Ben Hutchings
2012-10-05  0:50   ` Gao feng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349325689-16104-9-git-send-email-gaofeng@cn.fujitsu.com \
    --to=gaofeng@cn.fujitsu.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=jengelh@inai.de \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    --cc=steffen.klassert@secunet.com \
    --cc=stephen.hemminger@vyatta.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox