| Message ID | 4C2AF8EE.8030508@strongswan.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)