summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChris Wright <chrisw@osdl.org>2005-05-03 15:01:15 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-03 15:01:15 +0200
commit0dd8e06bdaa0a97e706ee1a489a1f6176c4ddc64 (patch)
treef09181360e5b68d46ea2856c9fa63eaa3515080c /kernel
parentMerge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
downloadlinux-0dd8e06bdaa0a97e706ee1a489a1f6176c4ddc64.tar.xz
linux-0dd8e06bdaa0a97e706ee1a489a1f6176c4ddc64.zip
[PATCH] add new audit data to last skb
When adding more formatted audit data to an skb for delivery to userspace, the kernel will attempt to reuse an skb that has spare room. However, if the audit message has already been fragmented to multiple skb's, the search for spare room in the skb uses the head of the list. This will corrupt the audit message with trailing bytes being placed midway through the stream. Fix is to look at the end of the list. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 4a697c73faec..00455a9cf027 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -486,7 +486,7 @@ static void audit_log_move(struct audit_buffer *ab)
if (ab->len == 0)
return;
- skb = skb_peek(&ab->sklist);
+ skb = skb_peek_tail(&ab->sklist);
if (!skb || skb_tailroom(skb) <= ab->len + extra) {
skb = alloc_skb(2 * ab->len + extra, GFP_ATOMIC);
if (!skb) {