Skip to content

Commit

Permalink
core: RPMB FS: provide tee_rpmb_fs_raw_open()
Browse files Browse the repository at this point in the history 
Provides tee_rpmb_fs_raw_open() use by OP-TEE OS.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
  • Loading branch information
@jenswi-linaro @jforissier
jenswi-linaro authored and jforissier committed Jun 27, 2017
1 parent 24f24f8 commit 078f18f
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 54 deletions.
3 changes: 3 additions & 0 deletions core/include/tee/tee_fs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ extern const struct tee_file_operations ree_fs_ops;
#endif
#ifdef CFG_RPMB_FS
extern const struct tee_file_operations rpmb_fs_ops;

TEE_Result tee_rpmb_fs_raw_open(const char *fname, bool create,
struct tee_file_handle **fh);
#endif

#endif /*TEE_FS_H*/
133 changes: 79 additions & 54 deletions core/tee/tee_rpmb_fs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1941,20 +1941,13 @@ static TEE_Result generate_fek(struct rpmb_fat_entry *fe, const TEE_UUID *uuid)
return res;
}

static TEE_Result rpmb_fs_open_internal(struct tee_pobj *po, bool create,
struct tee_file_handle **ret_fh)
static TEE_Result rpmb_fs_open_internal(struct rpmb_file_handle *fh,
const TEE_UUID *uuid, bool create)
{
struct rpmb_file_handle *fh = NULL;
tee_mm_pool_t p;
bool pool_result;
TEE_Result res = TEE_ERROR_GENERIC;

fh = alloc_file_handle(po, po->temporary);
if (!fh) {
res = TEE_ERROR_OUT_OF_MEMORY;
goto out;
}

/* We need to do setup in order to make sure fs_par is filled in */
res = rpmb_fs_setup();
if (res != TEE_SUCCESS)
Expand Down Expand Up @@ -1996,7 +1989,7 @@ static TEE_Result rpmb_fs_open_internal(struct tee_pobj *po, bool create,
/* Start address and size are 0 */
fh->fat_entry.flags = FILE_IS_ACTIVE;

res = generate_fek(&fh->fat_entry, &po->uuid);
res = generate_fek(&fh->fat_entry, uuid);
if (res != TEE_SUCCESS)
goto out;
DMSG("GENERATE FEK key: %p",
Expand All @@ -2012,11 +2005,6 @@ static TEE_Result rpmb_fs_open_internal(struct tee_pobj *po, bool create,
res = TEE_SUCCESS;

out:
if (res == TEE_SUCCESS)
*ret_fh = (struct tee_file_handle *)fh;
else
free(fh);

return res;
}

Expand Down Expand Up @@ -2066,12 +2054,11 @@ static TEE_Result rpmb_fs_read(struct tee_file_handle *tfh, size_t pos,
return res;
}

static TEE_Result rpmb_fs_write_primitive(struct tee_file_handle *tfh,
static TEE_Result rpmb_fs_write_primitive(struct rpmb_file_handle *fh,
size_t pos, const void *buf,
size_t size)
{
TEE_Result res;
struct rpmb_file_handle *fh = (struct rpmb_file_handle *)tfh;
tee_mm_pool_t p;
bool pool_result = false;
tee_mm_entry_t *mm;
Expand Down Expand Up @@ -2174,44 +2161,41 @@ static TEE_Result rpmb_fs_write(struct tee_file_handle *tfh, size_t pos,
TEE_Result res;

mutex_lock(&rpmb_mutex);
res = rpmb_fs_write_primitive(tfh, pos, buf, size);
res = rpmb_fs_write_primitive((struct rpmb_file_handle *)tfh, pos,
buf, size);
mutex_unlock(&rpmb_mutex);

return res;
}

static TEE_Result rpmb_fs_remove_internal(struct tee_pobj *po)
static TEE_Result rpmb_fs_remove_internal(struct rpmb_file_handle *fh)
{
TEE_Result res = TEE_ERROR_GENERIC;
struct rpmb_file_handle *fh = NULL;

fh = alloc_file_handle(po, po->temporary);
if (!fh) {
res = TEE_ERROR_OUT_OF_MEMORY;
goto out;
}
TEE_Result res;

res = read_fat(fh, NULL);
if (res != TEE_SUCCESS)
goto out;
if (res)
return res;

/* Clear this file entry. */
memset(&fh->fat_entry, 0, sizeof(struct rpmb_fat_entry));
res = write_fat_entry(fh, false);

out:
free(fh);
return res;
return write_fat_entry(fh, false);
}

static TEE_Result rpmb_fs_remove(struct tee_pobj *po)
{
TEE_Result res;
struct rpmb_file_handle *fh = alloc_file_handle(po, po->temporary);

if (!fh)
return TEE_ERROR_OUT_OF_MEMORY;

mutex_lock(&rpmb_mutex);
res = rpmb_fs_remove_internal(po);

res = rpmb_fs_remove_internal(fh);

mutex_unlock(&rpmb_mutex);

free(fh);
return res;
}

Expand Down Expand Up @@ -2560,60 +2544,69 @@ static void rpmb_fs_closedir(struct tee_fs_dir *dir)
}

static TEE_Result rpmb_fs_open(struct tee_pobj *po, size_t *size,
struct tee_file_handle **fh)
struct tee_file_handle **ret_fh)
{
TEE_Result res;
struct rpmb_file_handle *fh = alloc_file_handle(po, po->temporary);

if (!fh)
return TEE_ERROR_OUT_OF_MEMORY;

mutex_lock(&rpmb_mutex);
res = rpmb_fs_open_internal(po, false, fh);
if (!res && size) {
struct rpmb_file_handle *f = (struct rpmb_file_handle *)*fh;

*size = f->fat_entry.data_size;
}
res = rpmb_fs_open_internal(fh, &po->uuid, false);
if (!res && size)
*size = fh->fat_entry.data_size;

mutex_unlock(&rpmb_mutex);

if (res)
free(fh);
else
*ret_fh = (struct tee_file_handle *)fh;

return res;
}

static TEE_Result rpmb_fs_create(struct tee_pobj *po, bool overwrite,
const void *head, size_t head_size,
const void *attr, size_t attr_size,
const void *data, size_t data_size,
struct tee_file_handle **fh)
struct tee_file_handle **ret_fh)
{
TEE_Result res;
size_t pos = 0;
struct rpmb_file_handle *fh = alloc_file_handle(po, po->temporary);

if (!fh)
return TEE_ERROR_OUT_OF_MEMORY;

*fh = NULL;
mutex_lock(&rpmb_mutex);
res = rpmb_fs_open_internal(po, true, fh);
res = rpmb_fs_open_internal(fh, &po->uuid, true);
if (res)
goto out;

if (head && head_size) {
res = rpmb_fs_write_primitive(*fh, pos, head, head_size);
res = rpmb_fs_write_primitive(fh, pos, head, head_size);
if (res)
goto out;
pos += head_size;
}

if (attr && attr_size) {
res = rpmb_fs_write_primitive(*fh, pos, attr, attr_size);
res = rpmb_fs_write_primitive(fh, pos, attr, attr_size);
if (res)
goto out;
pos += attr_size;
}

if (data && data_size) {
res = rpmb_fs_write_primitive(*fh, pos, data, data_size);
res = rpmb_fs_write_primitive(fh, pos, data, data_size);
if (res)
goto out;
}

if (po->temporary) {
struct rpmb_file_handle *f = (struct rpmb_file_handle *)*fh;

/*
* If it's a temporary filename (which it normally is)
* rename into the final filename now that the file is
Expand All @@ -2626,14 +2619,17 @@ static TEE_Result rpmb_fs_create(struct tee_pobj *po, bool overwrite,
goto out;
}
/* Update file handle after rename. */
tee_svc_storage_create_filename(f->filename,
sizeof(f->filename), po, false);
tee_svc_storage_create_filename(fh->filename,
sizeof(fh->filename),
po, false);
}

out:
if (res && *fh) {
rpmb_fs_close(fh);
rpmb_fs_remove_internal(po);
if (res) {
rpmb_fs_remove_internal(fh);
free(fh);
} else {
*ret_fh = (struct tee_file_handle *)fh;
}
mutex_unlock(&rpmb_mutex);

Expand All @@ -2653,3 +2649,32 @@ const struct tee_file_operations rpmb_fs_ops = {
.closedir = rpmb_fs_closedir,
.readdir = rpmb_fs_readdir,
};

TEE_Result tee_rpmb_fs_raw_open(const char *fname, bool create,
struct tee_file_handle **ret_fh)
{
TEE_Result res;
struct rpmb_file_handle *fh = calloc(1, sizeof(*fh));
const TEE_UUID uuid = { 0 };

if (!fh)
return TEE_ERROR_OUT_OF_MEMORY;

snprintf(fh->filename, sizeof(fh->filename), "/%s", fname);

mutex_lock(&rpmb_mutex);

res = rpmb_fs_open_internal(fh, &uuid, create);

mutex_unlock(&rpmb_mutex);

if (res) {
if (create)
rpmb_fs_remove_internal(fh);
free(fh);
} else {
*ret_fh = (struct tee_file_handle *)fh;
}

return res;
}

0 comments on commit 078f18f

Please sign in to comment.