Skip to contentSkip to conversation

: Adjust the zeroing up to tail in __alloc_skb too

PATCH In review Arnaldo Carvalho de Melo 3 participants 4 messages Mar 19, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Adjust the zeroing up to tail in __alloc_skb too

Hi David,

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.22

- Arnaldo

---

I did it just in alloc_skb_from_cache, forgot __alloc_skb, fixed now.

---
 net/core/skbuff.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
net/core/skbuff.c +4 -1
index c274ea3..d7d2dc3 100644
@@ -164,7 +164,10 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
 	if (!data)
 		goto nodata;
 
-	memset(skb, 0, offsetof(struct sk_buff, truesize));
+	/*
+	 * See comment in sk_buff definition, just before the 'tail' member
+	 */
+	memset(skb, 0, offsetof(struct sk_buff, tail));
 	skb->truesize = size + sizeof(struct sk_buff);
 	atomic_set(&skb->users, 1);
 	skb->head = data;
Signature · 1 line
1.5.0.3
maintainer
#1 lore raw

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Mon, 19 Mar 2007 10:50:30 -0300

Quoted 5 lines

Hi David,

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.22

Pulled, thanks Arnaldo.

Can you please verify the white-space in your patches in the future? I have a ton of whitespace warnings from GIT to fix up as I'm rebasing the net-2.6.22 tree. The following "pcheck" script (which I've probably posted like 10 or more times) works great for this.

Unfortunately, when you "git commit" stuff GIT doesn't do whitespace damange checking by default, only when you are importing patches or similar :-/

#!/bin/sh
set -x
git apply --check --whitespace=error-all $1

#2 lore raw
Quoted 16 lines · David Miller

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Mon, 19 Mar 2007 10:50:30 -0300

Quoted 5 lines

Hi David,

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.22

Pulled, thanks Arnaldo.

Can you please verify the white-space in your patches in the future? I have a ton of whitespace warnings from GIT to fix up as I'm rebasing the net-2.6.22 tree. The following "pcheck" script (which I've probably posted like 10 or more times) works great for this.

Quoted 7 lines

Unfortunately, when you "git commit" stuff GIT doesn't do whitespace damange checking by default, only when you are importing patches or similar :-/

#!/bin/sh
set -x
git apply --check --whitespace=error-all $1

OK, I wasn' t expecting any whitspaces, probably were whitespaces already there that were kept, I'll try and check future patches.

- Arnaldo

maintainer
#3 lore raw

From: "Arnaldo Carvalho de Melo" <[email protected]>
Date: Mon, 19 Mar 2007 17:48:02 -0300

Quoted 2 lines

OK, I wasn' t expecting any whitspaces, probably were whitespaces already there that were kept,

I am pretty sure this is exactly what happened.

Quoted 1 line

I'll try and check future patches.

Thanks!