diff for duplicates of <20170523003945.14279-4-ebiggers3@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 488b440..e78b480 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,3 +18,16 @@ index 2cda3d67e2d0..7dc58bda279b 100644 { int err; - struct inode *inode = file->f_mapping->host; +- +- if (ubifs_crypt_is_encrypted(inode)) { +- err = fscrypt_get_encryption_info(inode); +- if (err) +- return -EACCES; +- if (!fscrypt_has_encryption_key(inode)) +- return -ENOKEY; +- } + + err = generic_file_mmap(file, vma); + if (err) +-- +2.13.0.303.g4ebf302169-goog diff --git a/a/content_digest b/N1/content_digest index 8233b48..fb322ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -30,6 +30,19 @@ " static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)\n" " {\n" " \tint err;\n" - "-\tstruct inode *inode = file->f_mapping->host;" + "-\tstruct inode *inode = file->f_mapping->host;\n" + "-\n" + "-\tif (ubifs_crypt_is_encrypted(inode)) {\n" + "-\t\terr = fscrypt_get_encryption_info(inode);\n" + "-\t\tif (err)\n" + "-\t\t\treturn -EACCES;\n" + "-\t\tif (!fscrypt_has_encryption_key(inode))\n" + "-\t\t\treturn -ENOKEY;\n" + "-\t}\n" + " \n" + " \terr = generic_file_mmap(file, vma);\n" + " \tif (err)\n" + "-- \n" + 2.13.0.303.g4ebf302169-goog -fd884799e80801a1f1c64d281fcd536cd808a19833b8d11f03eaf259efa33bc9 +dc47bf6cefca4b6cae8712a6941faabc23054b2620b30653088d34b32175b2a1
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.