diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-06-30 19:41:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-30 19:43:31 +0200 |
| commit | 4efd7e833591721bec21cc4730a7f6261417840f (patch) | |
| tree | 9982ea86ad73f1142842070f4d9d1bf83ba318a0 | |
| parent | ixgbe: skip non IPv4 packets in ATR filter (diff) | |
| download | linux-4efd7e833591721bec21cc4730a7f6261417840f.tar.xz linux-4efd7e833591721bec21cc4730a7f6261417840f.zip | |
xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
Determine the size of the xfrm_mark struct, not of its pointer.
Signed-off-by: Andreas Steffen <andreas.steffen@strongswan.org>
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/xfrm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 1913af67c43d..fc8f36dd0f5c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1586,7 +1586,7 @@ static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb) static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m) { if (attrs[XFRMA_MARK]) - memcpy(m, nla_data(attrs[XFRMA_MARK]), sizeof(m)); + memcpy(m, nla_data(attrs[XFRMA_MARK]), sizeof(struct xfrm_mark)); else m->v = m->m = 0; |