From: Chris Wright <chrisw@osdl.org>
Date: Sun, 18 Sep 2005 04:40:56 +0000 (-0700)
Subject: Add missing-acct-mm-calls-in-compat_do_execve.patch from DaveM
X-Git-Tag: v2.6.13.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fb06699f76a211851b4fdc56d92acde378ede9b;p=thirdparty%2Fkernel%2Fstable-queue.git

Add missing-acct-mm-calls-in-compat_do_execve.patch from DaveM
---

diff --git a/queue/missing-acct-mm-calls-in-compat_do_execve.patch b/queue/missing-acct-mm-calls-in-compat_do_execve.patch
new file mode 100644
index 00000000000..cf96e036975
--- /dev/null
+++ b/queue/missing-acct-mm-calls-in-compat_do_execve.patch
@@ -0,0 +1,45 @@
+From stable-bounces@linux.kernel.org  Sat Sep 17 14:57:44 2005
+Date: Wed, 14 Sep 2005 11:56:16 -0700 (PDT)
+To: linux-kernel@vger.kernel.org
+CC: akpm@osdl.org, torvalds@osdl.org
+Subject: [PATCH]: Missing acct/mm calls in compat_do_execve()
+From: "David S. Miller" <davem@davemloft.net>
+
+As I do periodically, I checked to see how far out of sync
+compat_do_execve() has gotten from do_execve().  And as usual there
+was some missing stuff in the former.  Perhaps we need some tighter
+consolidation of these two routines to make this less likely to happen
+in the future.
+
+Anyways, on the success path of compat_do_execve() we forget
+to call acct_update_integrals() and update_mem_hiwater(), as
+is done in do_execve().
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+ fs/compat.c |    4 ++++
+ 1 files changed, 4 insertions(+)
+
+Index: linux-2.6.13.y/fs/compat.c
+===================================================================
+--- linux-2.6.13.y.orig/fs/compat.c
++++ linux-2.6.13.y/fs/compat.c
+@@ -44,6 +44,8 @@
+ #include <linux/nfsd/syscall.h>
+ #include <linux/personality.h>
+ #include <linux/rwsem.h>
++#include <linux/acct.h>
++#include <linux/mm.h>
+ 
+ #include <net/sock.h>		/* siocdevprivate_ioctl */
+ 
+@@ -1567,6 +1569,8 @@ int compat_do_execve(char * filename,
+ 
+ 		/* execve success */
+ 		security_bprm_free(bprm);
++		acct_update_integrals(current);
++		update_mem_hiwater(current);
+ 		kfree(bprm);
+ 		return retval;
+ 	}
diff --git a/queue/series b/queue/series
index b2d8e84baaf..48d83caf655 100644
--- a/queue/series
+++ b/queue/series
@@ -2,3 +2,4 @@ yenta-oops-fix.patch
 fix-de_thread-BUG_ON.patch
 ipv6-fix-per-socket-multicast-filtering.patch
 ipvs-ip_vs_ftp-breaks-connections.patch
+missing-acct-mm-calls-in-compat_do_execve.patch