evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pfk: fixed bug that caused eCryptfs ignore some of its files

Browse source 
Our logic that distinguished eCryptfs files from non eCryptfs ones
checked bi_vcnt field in bio to make sure it has valid bio vecs.
Apparently this field is not updated in some cases by block layer
and in general can't be trusted outside of code that own bio.
There is another field that need to be used for this purpose - bi_size

Change-Id: Ibf225543618373699a0d5adc3295daf9ded6169a
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
This commit is contained in:
Andrey Markovytch 2015-11-15 15:00:35 +02:00 • committed by David Keitel
parent f707680de8
commit 5c84da193d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
security/pfe/pfk.c
View file

@ -143,8 +143,8 @@ static int pfk_get_page_index(const struct bio *bio, pgoff_t *page_index)
if (!bio || !page_index) if (!bio || !page_index)
return -EPERM; return -EPERM;
/* check bio vec count > 0 before using the bio->bi_io_vec[] array */ /* check bio bi_size > 0 before using the bio->bi_io_vec[] array */
if (!bio->bi_vcnt) if (!(bio->bi_iter).bi_size)
return -EINVAL; return -EINVAL;
if (!bio->bi_io_vec) if (!bio->bi_io_vec)
return -EINVAL; return -EINVAL;
@ -173,8 +173,8 @@ static struct inode *pfk_bio_get_inode(const struct bio *bio)
{ {
if (!bio) if (!bio)
return NULL; return NULL;
/* check bio vec count > 0 before using the bio->bi_io_vec[] array */ /* check bio bi_size > 0 before using the bio->bi_io_vec[] array */
if (!bio->bi_vcnt) if (!(bio->bi_iter).bi_size)
return NULL; return NULL;
if (!bio->bi_io_vec) if (!bio->bi_io_vec)
return NULL; return NULL;