Remove MS_NOEXEC option from ext4 mount for extended internal storage

Change-Id: Ia6a0947427a68323df24e3e32cc38d2ab4f98375
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/src/block/block.c b/src/block/block.c
index fcbb236..b76d2a4 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -98,6 +98,7 @@
 
 #define EXT4_NAME              "ext4"
 #define LUKS_NAME              "crypto_LUKS"
+#define EXTENDEDSD_NAME                "extendedsd"
 
 /* Minimum value of block id */
 #define BLOCK_ID_MIN 10
@@ -2199,7 +2200,7 @@ static int add_block_device(struct udev_device *dev, const char *devnode, bool m
                bdev->data->block_type = BLOCK_EXTENDEDSD_DEV;
                _D("Need to unlock encrypted sdcard");
                // ---- ODE UI launch ----
-               ret = launch_system_app(POPUP_DEFAULT, 8, POPUP_KEY_CONTENT, "unlockextendedsd", VIEWTYPE_KEY, INSERT_SD_CARD, DEVPATH_KEY, bdev->data->devnode, MAPPING_NODE_KEY, EXTENDEDSD);
+               ret = launch_system_app(POPUP_DEFAULT, 8, POPUP_KEY_CONTENT, "unlockextendedsd", VIEWTYPE_KEY, INSERT_SD_CARD, DEVPATH_KEY, bdev->data->devnode, MAPPING_NODE_KEY, EXTENDEDSD_NAME);
                if (ret < 0)
                        _E("Failed to launch popup");
 

diff --git a/src/block/ext4.c b/src/block/ext4.c
index 2e79c34..f05b160 100644 (file)
--- a/src/block/ext4.c
+++ b/src/block/ext4.c
@@ -117,7 +117,7 @@ static int ext4_mount(bool smack, const char *devpath, const char *mount_point)
 {
        int r, retry = RETRY_COUNT;
        struct timespec time = {0,};
-       unsigned long mountflags = MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_DIRSYNC;
+       unsigned long mountflags = MS_NOSUID | MS_NODEV | MS_DIRSYNC;
 
        do {
                r = mount(devpath, mount_point, "ext4", mountflags, NULL);