Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Don't double-free obj->p...



details:   https://anonhg.NetBSD.org/src/rev/5659e5b021ee
branches:  trunk
changeset: 330686:5659e5b021ee
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jul 17 21:14:24 2014 +0000

description:
Don't double-free obj->pages, with two different allocators to boot!

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 081e912b3c91 -r 5659e5b021ee sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Thu Jul 17 21:13:49 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Thu Jul 17 21:14:24 2014 +0000
@@ -302,8 +302,8 @@
        kmem_free(obj->pages, (obj->igo_nsegs * sizeof(obj->pages[0])));
 #else
        sg_free_table(obj->pages);
+       kfree(obj->pages);
 #endif
-       kfree(obj->pages);
 }
 
 static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {



Home | Main Index | Thread Index | Old Index