linux-stable.git/fs/ecryptfs/crypto.c, branch linux-3.16.y

eCryptfs: fix a couple type promotion bugs

2019-10-31T22:14:49+00:00

commit 0bdf8a8245fdea6f075a5fede833a5fcf1b3466c upstream.

ECRYPTFS_SIZE_AND_MARKER_BYTES is type size_t, so if "rc" is negative
that gets type promoted to a high positive value and treated as success.

Fixes: 778aeb42a708 ("eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()")
Signed-off-by: Dan Carpenter 
[tyhicks: Use "if/else if" rather than "if/if"]
Signed-off-by: Tyler Hicks 
Signed-off-by: Ben Hutchings

eCryptfs: Remove buggy and unnecessary write in file name decode routine

2015-01-15T10:44:18+00:00

commit 942080643bce061c3dd9d5718d3b745dcb39a8bc upstream.

Dmitry Chernenkov used KASAN to discover that eCryptfs writes past the
end of the allocated buffer during encrypted filename decoding. This
fix corrects the issue by getting rid of the unnecessary 0 write when
the current bit offset is 2.

Signed-off-by: Michael Halcrow 
Reported-by: Dmitry Chernenkov 
Suggested-by: Kees Cook 
Signed-off-by: Tyler Hicks 
Signed-off-by: Luis Henriques

tree-wide: use reinit_completion instead of INIT_COMPLETION

2013-11-15T00:32:21+00:00

Use this new function to make code more comprehensible, since we are
reinitialzing the completion, not initializing.

[akpm@linux-foundation.org: linux-next resyncs]
Signed-off-by: Wolfram Sang 
Acked-by: Linus Walleij  (personally at LCE13)
Cc: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: fix 32 bit corruption issue

2013-10-24T19:36:30+00:00

Shifting page->index on 32 bit systems was overflowing, causing
data corruption of > 4GB files. Fix this by casting it first.

https://launchpad.net/bugs/1243636

Signed-off-by: Colin Ian King 
Reported-by: Lars Duesing 
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Tyler Hicks

ecryptfs: avoid ctx initialization race

2013-09-06T23:58:18+00:00

It might be possible for two callers to race the mutex lock after the
NULL ctx check. Instead, move the lock above the check so there isn't
the possibility of leaking a crypto ctx. Additionally, report the full
algo name when failing.

Signed-off-by: Kees Cook 
[tyhicks: remove out label, which is no longer used]
Signed-off-by: Tyler Hicks

ecryptfs: remove check for if an array is NULL

2013-09-06T23:51:56+00:00

It doesn't make sense to check if an array is NULL.  The compiler just
removes the check.

Signed-off-by: Dan Carpenter 
Signed-off-by: Tyler Hicks

Merge tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

2013-07-11T17:20:18+00:00

Pull eCryptfs updates from Tyler Hicks:
 "Code cleanups and improved buffer handling during page crypto
  operations:
   - Remove redundant code by merging some encrypt and decrypt functions
   - Get rid of a helper page allocation during page decryption by using
     in-place decryption
   - Better use of entire pages during page crypto operations
   - Several code cleanups"

* tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  Use ecryptfs_dentry_to_lower_path in a couple of places
  eCryptfs: Make extent and scatterlist crypt function parameters similar
  eCryptfs: Collapse crypt_page_offset() into crypt_extent()
  eCryptfs: Merge ecryptfs_encrypt_extent() and ecryptfs_decrypt_extent()
  eCryptfs: Combine page_offset crypto functions
  eCryptfs: Combine encrypt_scatterlist() and decrypt_scatterlist()
  eCryptfs: Decrypt pages in-place
  eCryptfs: Accept one offset parameter in page offset crypto functions
  eCryptfs: Simplify lower file offset calculation
  eCryptfs: Read/write entire page during page IO
  eCryptfs: Use entire helper page during page crypto operations
  eCryptfs: Cocci spatch "memdup.spatch"

ecryptfs: switch ecryptfs_decode_and_decrypt_filename() from dentry to sb

2013-06-29T08:57:25+00:00

Signed-off-by: Al Viro

eCryptfs: Make extent and scatterlist crypt function parameters similar

2013-06-08T00:28:29+00:00

The 'dest' abbreviation is only used in crypt_scatterlist(), while all
other functions in crypto.c use 'dst' so dest_sg should be renamed to
dst_sg.

The crypt_stat parameter is typically the first parameter in internal
eCryptfs functions so crypt_stat and dst_page should be swapped in
crypt_extent().

Signed-off-by: Tyler Hicks

eCryptfs: Collapse crypt_page_offset() into crypt_extent()

2013-06-08T00:28:28+00:00

crypt_page_offset() simply initialized the two scatterlists and called
crypt_scatterlist() so it is simple enough to move into the only
function that calls it.

Signed-off-by: Tyler Hicks