projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3ead24
)
xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
author
Andreas Steffen
<andreas.steffen@strongswan.org>
Wed, 30 Jun 2010 17:41:15 +0000
(10:41 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 30 Jun 2010 17:43:31 +0000
(10:43 -0700)
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>
include/net/xfrm.h
patch
|
blob
|
history
diff --git
a/include/net/xfrm.h
b/include/net/xfrm.h
index
1913af6
..
fc8f36d
100644
(file)
--- 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;