--- zzzz-none-000/linux-2.6.32.61/net/xfrm/xfrm_user.c	2013-06-10 09:43:48.000000000 +0000
+++ virian-300e-630/linux-2.6.32.61/net/xfrm/xfrm_user.c	2010-04-08 11:00:21.000000000 +0000
@@ -506,7 +506,6 @@
 
 static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p)
 {
-	memset(p, 0, sizeof(*p));
 	memcpy(&p->id, &x->id, sizeof(p->id));
 	memcpy(&p->sel, &x->sel, sizeof(p->sel));
 	memcpy(&p->lft, &x->lft, sizeof(p->lft));
@@ -647,7 +646,6 @@
 {
 	struct xfrm_dump_info info;
 	struct sk_buff *skb;
-	int err;
 
 	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
 	if (!skb)
@@ -658,10 +656,9 @@
 	info.nlmsg_seq = seq;
 	info.nlmsg_flags = 0;
 
-	err = dump_one_state(x, 0, &info);
-	if (err) {
+	if (dump_one_state(x, 0, &info)) {
 		kfree_skb(skb);
-		return ERR_PTR(err);
+		return NULL;
 	}
 
 	return skb;
@@ -1078,7 +1075,6 @@
 
 static void copy_to_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy_info *p, int dir)
 {
-	memset(p, 0, sizeof(*p));
 	memcpy(&p->sel, &xp->selector, sizeof(p->sel));
 	memcpy(&p->lft, &xp->lft, sizeof(p->lft));
 	memcpy(&p->curlft, &xp->curlft, sizeof(p->curlft));
@@ -1180,7 +1176,6 @@
 		struct xfrm_user_tmpl *up = &vec[i];
 		struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
 
-		memset(up, 0, sizeof(*up));
 		memcpy(&up->id, &kp->id, sizeof(up->id));
 		up->family = kp->encap_family;
 		memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr));
@@ -1306,7 +1301,6 @@
 {
 	struct xfrm_dump_info info;
 	struct sk_buff *skb;
-	int err;
 
 	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
 	if (!skb)
@@ -1317,10 +1311,9 @@
 	info.nlmsg_seq = seq;
 	info.nlmsg_flags = 0;
 
-	err = dump_one_policy(xp, dir, 0, &info);
-	if (err) {
+	if (dump_one_policy(xp, dir, 0, &info) < 0) {
 		kfree_skb(skb);
-		return ERR_PTR(err);
+		return NULL;
 	}
 
 	return skb;