diff --git a/soc/Android.bp b/soc/Android.bp
index 9600855..57b8577 100644
--- a/soc/Android.bp
+++ b/soc/Android.bp
@@ -2,6 +2,13 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+sh_binary {
+    name: "dump_memory.sh",
+    src: "dump_memory.sh",
+    vendor: true,
+    sub_dir: "dump",
+}
+
 cc_binary {
     name: "dump_soc",
     srcs: ["dump_soc.cpp"],
diff --git a/soc/dump_memory.sh b/soc/dump_memory.sh
new file mode 100644
index 0000000..5f4bde7
--- /dev/null
+++ b/soc/dump_memory.sh
@@ -0,0 +1,22 @@
+#!/vendor/bin/sh
+echo "------ ION HEAPS ------"
+for d in $(ls -d /d/ion/*)
+do
+  if [ -f $d ]; then
+    echo --- $d
+    cat $d
+  else
+    for f in $(ls $d)
+    do
+      echo --- $d/$f
+      cat $d/$f
+    done
+  fi
+done
+
+echo "------ dmabuf info ------"
+cat "/d/dma_buf/bufinfo"
+
+echo "------ Page Pinner - longterm pin ------"
+cat "/sys/kernel/debug/page_pinner/buffer"
+
diff --git a/soc/sepolicy/dump_memory.te b/soc/sepolicy/dump_memory.te
new file mode 100644
index 0000000..47f9f07
--- /dev/null
+++ b/soc/sepolicy/dump_memory.te
@@ -0,0 +1,8 @@
+pixel_bugreport(dump_memory)
+allow dump_memory vendor_toolbox_exec:file execute_no_trans;
+userdebug_or_eng(`
+  allow dump_memory vendor_dmabuf_debugfs:file r_file_perms;
+  allow dump_memory vendor_page_pinner_debugfs:dir r_dir_perms;
+  allow dump_memory vendor_page_pinner_debugfs:file r_file_perms;
+')
+
diff --git a/soc/sepolicy/dumpstate.te b/soc/sepolicy/dumpstate.te
new file mode 100644
index 0000000..1d23bb4
--- /dev/null
+++ b/soc/sepolicy/dumpstate.te
@@ -0,0 +1,2 @@
+dontaudit dumpstate vendor_dmabuf_debugfs:file r_file_perms;
+
diff --git a/soc/sepolicy/file.te b/soc/sepolicy/file.te
new file mode 100644
index 0000000..553825a
--- /dev/null
+++ b/soc/sepolicy/file.te
@@ -0,0 +1,3 @@
+type vendor_dmabuf_debugfs, fs_type, debugfs_type;
+type vendor_page_pinner_debugfs, fs_type, debugfs_type;
+
diff --git a/soc/sepolicy/file_contexts b/soc/sepolicy/file_contexts
index 81b1e68..23a91e5 100644
--- a/soc/sepolicy/file_contexts
+++ b/soc/sepolicy/file_contexts
@@ -1 +1,3 @@
-/vendor/bin/dump/dump_soc      u:object_r:dump_soc_exec:s0
+/vendor/bin/dump/dump_soc           u:object_r:dump_soc_exec:s0
+/vendor/bin/dump/dump_memory\.sh    u:object_r:dump_memory_exec:s0
+
diff --git a/soc/sepolicy/genfs_contexts b/soc/sepolicy/genfs_contexts
index 07ae4b8..454ab6a 100644
--- a/soc/sepolicy/genfs_contexts
+++ b/soc/sepolicy/genfs_contexts
@@ -5,3 +5,6 @@
 genfscon sysfs /devices/system/chip-id/revision        u:object_r:sysfs_chip_id:s0
 genfscon sysfs /devices/system/chip-id/raw_str         u:object_r:sysfs_chip_id:s0
 
+genfscon debugfs /dma_buf/bufinfo                      u:object_r:vendor_dmabuf_debugfs:s0
+genfscon debugfs /page_pinner                          u:object_r:vendor_page_pinner_debugfs:s0
+
diff --git a/soc/soc.mk b/soc/soc.mk
index 75b134e..b9b6208 100644
--- a/soc/soc.mk
+++ b/soc/soc.mk
@@ -1,3 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/soc/sepolicy
 
 PRODUCT_PACKAGES += dump_soc
+PRODUCT_PACKAGES_DEBUG += dump_memory.sh
+