aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-01-28 23:47:09 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:27:08 -0500
commit406a1d868001423c85a3165288e566e65f424fe6 (patch)
tree2663aa7139f884ba5ef0425911fc9a579fcb1c6f /kernel
parent29ffe1a5c52dae13b6efead97aab9b058f38fce4 (diff)
[AUDIT]: Increase skb->truesize in audit_expand
The recent UDP patch exposed this bug in the audit code. It was calling pskb_expand_head without increasing skb->truesize. The caller of pskb_expand_head needs to do so because that function is designed to be called in places where truesize is already fixed and therefore it doesn't update its value. Because the audit system is using it in a place where the truesize has not yet been fixed, it needs to update its value manually. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index f93c2713017d..801c946dd24b 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1200,13 +1200,17 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
1200static inline int audit_expand(struct audit_buffer *ab, int extra) 1200static inline int audit_expand(struct audit_buffer *ab, int extra)
1201{ 1201{
1202 struct sk_buff *skb = ab->skb; 1202 struct sk_buff *skb = ab->skb;
1203 int ret = pskb_expand_head(skb, skb_headroom(skb), extra, 1203 int oldtail = skb_tailroom(skb);
1204 ab->gfp_mask); 1204 int ret = pskb_expand_head(skb, 0, extra, ab->gfp_mask);
1205 int newtail = skb_tailroom(skb);
1206
1205 if (ret < 0) { 1207 if (ret < 0) {
1206 audit_log_lost("out of memory in audit_expand"); 1208 audit_log_lost("out of memory in audit_expand");
1207 return 0; 1209 return 0;
1208 } 1210 }
1209 return skb_tailroom(skb); 1211
1212 skb->truesize += newtail - oldtail;
1213 return newtail;
1210} 1214}
1211 1215
1212/* 1216/*