netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
@ 2010-06-30  7:57 Andreas Steffen
  2010-06-30 10:07 ` jamal
  2010-06-30 17:41 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Andreas Steffen @ 2010-06-30  7:57 UTC (permalink / raw)
  To: netdev; +Cc: jamal, David Miller

Determine the size of the xfrm_mark struct, not of its pointer.

Signed-off-by: Andreas Steffen <andreas.steffen@strongswan.org>
---
 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 1913af6..fc8f36d 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;
 
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
  2010-06-30  7:57 [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get Andreas Steffen
@ 2010-06-30 10:07 ` jamal
  2010-06-30 17:41 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: jamal @ 2010-06-30 10:07 UTC (permalink / raw)
  To: Andreas Steffen; +Cc: netdev, David Miller, Simon Horman

On Wed, 2010-06-30 at 09:57 +0200, Andreas Steffen wrote:
> Determine the size of the xfrm_mark struct, not of its pointer.
> 
> Signed-off-by: Andreas Steffen <andreas.steffen@strongswan.org>

Good catch (you are right this was tested on 64 bit ;->).
The preferred style would be what Simon mentioned. No biggie if
you keep it this way - but if you resubmit, add:
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>

cheers,
jamal



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
  2010-06-30  7:57 [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get Andreas Steffen
  2010-06-30 10:07 ` jamal
@ 2010-06-30 17:41 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-06-30 17:41 UTC (permalink / raw)
  To: andreas.steffen; +Cc: netdev, hadi

From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 30 Jun 2010 09:57:34 +0200

> Determine the size of the xfrm_mark struct, not of its pointer.
> 
> Signed-off-by: Andreas Steffen <andreas.steffen@strongswan.org>

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-06-30 17:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-30  7:57 [PATCH] xfrm: fix XFRMA_MARK extraction in xfrm_mark_get Andreas Steffen
2010-06-30 10:07 ` jamal
2010-06-30 17:41 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).