← Back to branch summary

~ubuntu-branches/ubuntu/raring/autofs5/raring

« back to all changes in this revision

Viewing changes to debian/patches/01UPSTREAM_autofs-5.0.4-fix-double-free-in-expire_proc.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Jan Christoph Nordholz
  • Date: 2009-08-28 21:24:14 UTC
  • mfrom: (5.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090828212414-z9xvmo5kdpm26vxv
Tags: 5.0.4-3
http://bugs.debian.org/541841
* Fix LSB initscript header to use keywords that
  insserv knows about. Closes: #541841.
* Bump Standards version to 3.8.3.
  * Add README.source.

* Upload sponsored by Petter Reinholdtsen.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01UPSTREAM_autofs-5.0.4-fix-double-free-in-expire_proc.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 01UPSTREAM_autofs-5.0.4-fix-double-free-in-expire_proc.patch
 
3
##
 
4
## DP: Upstream patch on top of 5.0.4.
 
5
 
 
6
@DPATCH@
 
7
autofs-5.0.4 - fix double free in expire_proc()
 
8
 
 
9
From: Ian Kent <raven@themaw.net>
 
10
 
 
11
In state.c:expire_proc() the function expire_proc_cleanup() is called
 
12
which frees the parameter structure but automount frees this again in
 
13
the following line.
 
14
---
 
15
 
 
16
 CHANGELOG      |    1 +
 
17
 daemon/state.c |    1 -
 
18
 2 files changed, 1 insertions(+), 1 deletions(-)
 
19
 
 
20
 
 
21
diff --git a/CHANGELOG b/CHANGELOG
 
22
index 2cb35dc..8860b2c 100644
 
23
--- a/CHANGELOG
 
24
+++ b/CHANGELOG
 
25
@@ -28,6 +28,7 @@
 
26
 - add nfs mount protocol default configuration option.
 
27
 - fix bad token declaration in master map parser.
 
28
 - fix return start status on fail.
 
29
+- fix double free in expire_proc().
 
30
 
 
31
 4/11/2008 autofs-5.0.4
 
32
 -----------------------
 
33
diff --git a/daemon/state.c b/daemon/state.c
 
34
index 606743b..417fde1 100644
 
35
--- a/daemon/state.c
 
36
+++ b/daemon/state.c
 
37
@@ -298,7 +298,6 @@ static enum expire expire_proc(struct autofs_point *ap, int now)
 
38
                error(ap->logopt,
 
39
                      "expire thread create for %s failed", ap->path);
 
40
                expire_proc_cleanup((void *) ea);
 
41
-               free(ea);
 
42
                return EXP_ERROR;
 
43
        }
 
44
        ap->exp_thread = thid;