Permalink
Commits on Feb 6, 2018
  1. qcacld-2.0: Update to LA.UM.5.5.r1-06700-8x96.0

    dianlujitao committed Feb 6, 2018
    Change-Id: I93de5196919c4159b38107056d1b6334bf235332
  2. Merge tag 'LA.UM.5.5.r1-06700-8x96.0' into cm-14.1

    dianlujitao committed Feb 6, 2018
    "LA.UM.5.5.r1-06700-8x96.0"
    
    Change-Id: I1d96a7e9a86d192f5afe5552d0c6af30756c5d69
  3. ANDROID: xattr: Pass EOPNOTSUPP to permission2

    Daniel Rosenberg authored and dianlujitao committed Jan 23, 2018
    The permission call for xattr operations happens regardless of
    whether or not the xattr functions are implemented.
    
    The xattr functions currently don't have support for permission2.
    Passing EOPNOTSUPP as the mount point in xattr_permission allows
    us to return EOPNOTSUPP early in permission2, if the filesystem
    supports it.
    
    Change-Id: I9d07e4cd633cf40af60450ffbff7ac5c1b4e8c2c
    Signed-off-by: Daniel Rosenberg <drosen@google.com>
    Bug: 35848445
  4. ANDROID: sdcardfs: Move default_normal to superblock

    Daniel Rosenberg authored and dianlujitao committed Jan 19, 2018
    Moving default_normal from mount info to superblock info
    as it doesn't need to change between mount points.
    
    Signed-off-by: Daniel Rosenberg <drosen@google.com>
    Bug: 72158116
    Change-Id: I16c6a0577c601b4f7566269f7e189fcf697afd4e
  5. ANDROID: sdcardfs: Fix missing break on default_normal

    Daniel Rosenberg authored and dianlujitao committed Jan 8, 2018
    Signed-off-by: Daniel Rosenberg <drosen@google.com>
    Bug: 64672411
    Change-Id: I98796df95dc9846adb77a11f49a1a254fb1618b1
  6. f2fs: Reset to v4.14-rc1-3.18

    dianlujitao committed Feb 6, 2018
     * The latest v4.15-rc4-3.18 caused userspace failed to attach
       SELinux context when encrypted.
     * This resets fs/f2fs back to commit 2e5355b, but includes
       commit c422761
    
    Change-Id: Ie66dba45454d123111ef470e2a3727aa7cd7a527
Commits on Jan 23, 2018
  1. fscrypt: resolve some cherry-pick bugs

    Jaegeuk Kim authored and dianlujitao committed Jan 10, 2018
    - remove wrong linux/fscrypt.h declared in ext4
    - remove obsolete function
    
    Fixes: 734f0d241d2b ("fscrypt: clean up include file mess")
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Commits on Jan 21, 2018
  1. Merge "ARM: dts: msm: Add DT support for SDA450 with PMI8950" into re…

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Jan 21, 2018
    …l/msm-3.18.r5
Commits on Jan 19, 2018
  1. Merge e119380 on remote branch

    Linux Build Service Account
    Linux Build Service Account committed Jan 19, 2018
    Change-Id: I093737428704aec940bd10eced22aa2ed159f213
Commits on Jan 17, 2018
  1. Promotion of kernel.lnx.3.18.c5-180117.

    Linux Build Service Account
    Linux Build Service Account committed Jan 17, 2018
    CRs      Change ID                                   Subject
    --------------------------------------------------------------------------------------------------------------
    2166744   Ia70e52b7ba4696e8cf705712402e75fecd445fcd   socinfo: msm: Add soc id for SDA450
    
    Change-Id: Ib4738633bb5eca74464f20e6dc1031ca26b491fd
    CRs-Fixed: 2166744
  2. Merge "socinfo: msm: Add soc id for SDA450"

    Linux Build Service Account Gerrit - the friendly Code Review server
    Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Jan 17, 2018
Commits on Jan 13, 2018
  1. Promotion of kernel.lnx.3.18.c5-180113.

    Linux Build Service Account
    Linux Build Service Account committed Jan 13, 2018
    CRs      Change ID                                   Subject
    --------------------------------------------------------------------------------------------------------------
    2151146   Ic813433655411f1447db8b0c15efdf64038d8c26   msm: ipa: Fix the handling of default IPA header
    
    Change-Id: I39ae4ef0c3b07ab83a27fac597c4b47af9110b29
    CRs-Fixed: 2151146
Commits on Jan 12, 2018
  1. msm: ipa: Fix the handling of default IPA header

    Ghanim Fodi Gerrit - the friendly Code Review server
    Ghanim Fodi authored and Gerrit - the friendly Code Review server committed Dec 19, 2017
    Default IPA header is added or deleted from the driver
    directly and not by user space application. This change
    prevents adding/deleting it from user application which
    may cause inconsistencies in the driver. Also the change
    fixes the header reset function to skip on the correct
    default header.
    
    Change-Id: Ic813433655411f1447db8b0c15efdf64038d8c26
    CRs-fixed: 2151146
    Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
  2. socinfo: msm: Add soc id for SDA450

    Shadab Naseem Gerrit - the friendly Code Review server
    Shadab Naseem authored and Gerrit - the friendly Code Review server committed Dec 28, 2017
    Add soc id for SDA450 in socinfo driver.
    SDA450 is APQ version of SDM450.
    
    Change-Id: Ia70e52b7ba4696e8cf705712402e75fecd445fcd
    Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
Commits on Jan 10, 2018
  1. ARM: dts: msm: Add DT support for SDA450 with PMI8950

    Shadab Naseem Shreyas Narayan
    Shadab Naseem authored and Shreyas Narayan committed Dec 29, 2017
    Add device tree support for SDA450 with PMI8950 for mtp and cdp board.
    
    Change-Id: I14448d0fb0213502efb6e427e5379cf162eed49d
    Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
Commits on Jan 9, 2018
  1. Promotion of kernel.lnx.3.18.c5-180109.

    Linux Build Service Account
    Linux Build Service Account committed Jan 9, 2018
    CRs      Change ID                                   Subject
    --------------------------------------------------------------------------------------------------------------
    2152401   Ieec3d88e6dae0177787da0906f53d59ac4f5a624   msm: sensor: actuator: add null pointer check for i2c ar
    
    Change-Id: Id2f458f0d1aea765f6d31ee7547910c036f9a7ce
    CRs-Fixed: 2152401
Commits on Jan 8, 2018
  1. msm: sensor: actuator: add null pointer check for i2c array

    Haibin Liu Gerrit - the friendly Code Review server
    Haibin Liu authored and Gerrit - the friendly Code Review server committed Dec 5, 2017
    Issue:
    i2c_reg_tbl may be null under error condition when set param.
    then, other actuator function still may use the i2c_reg_tbl as null.
    Fix:
    1) the assignment total_steps follow on kmalloc buffer.
    2) Add NULL pointer check for i2c tbl.
    
    CRs-Fixed: 2152401
    Change-Id: Ieec3d88e6dae0177787da0906f53d59ac4f5a624
    Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
Commits on Jan 7, 2018
  1. fscrypt: move to generic async completion

    gby authored and dianlujitao committed Oct 18, 2017
    fscrypt starts several async. crypto ops and waiting for them to
    complete. Move it over to generic code doing the same.
    
    Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  2. crypto: introduce crypto wait for async op

    gby authored and dianlujitao committed Oct 18, 2017
    Invoking a possibly async. crypto op and waiting for completion
    while correctly handling backlog processing is a common task
    in the crypto API implementation and outside users of it.
    
    This patch adds a generic implementation for doing so in
    preparation for using it across the board instead of hand
    rolled versions.
    
    Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
    CC: Eric Biggers <ebiggers3@gmail.com>
    CC: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  3. fscrypt: lock mutex before checking for bounce page pool

    ebiggers authored and dianlujitao committed Oct 29, 2017
    fscrypt_initialize(), which allocates the global bounce page pool when
    an encrypted file is first accessed, uses "double-checked locking" to
    try to avoid locking fscrypt_init_mutex.  However, it doesn't use any
    memory barriers, so it's theoretically possible for a thread to observe
    a bounce page pool which has not been fully initialized.  This is a
    classic bug with "double-checked locking".
    
    While "only a theoretical issue" in the latest kernel, in pre-4.8
    kernels the pointer that was checked was not even the last to be
    initialized, so it was easily possible for a crash (NULL pointer
    dereference) to happen.  This was changed only incidentally by the large
    refactor to use fs/crypto/.
    
    Solve both problems in a trivial way that can easily be backported: just
    always take the mutex.  It's theoretically less efficient, but it
    shouldn't be noticeable in practice as the mutex is only acquired very
    briefly once per encrypted file.
    
    Later I'd like to make this use a helper macro like DO_ONCE().  However,
    DO_ONCE() runs in atomic context, so we'd need to add a new macro that
    allows blocking.
    
    Cc: stable@vger.kernel.org # v4.1+
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  4. fscrypt: new helper function - fscrypt_prepare_setattr()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Introduce a helper function for filesystems to call when processing
    ->setattr() on a possibly-encrypted inode.  It handles enforcing that an
    encrypted file can only be truncated if its encryption key is available.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  5. fscrypt: new helper function - fscrypt_prepare_lookup()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Introduce a helper function which prepares to look up the given dentry
    in the given directory.  If the directory is encrypted, it handles
    loading the directory's encryption key, setting the dentry's ->d_op to
    fscrypt_d_ops, and setting DCACHE_ENCRYPTED_WITH_KEY if the directory's
    encryption key is available.
    
    Note: once all filesystems switch over to this, we'll be able to move
    fscrypt_d_ops and fscrypt_set_encrypted_dentry() to fscrypt_private.h.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  6. fscrypt: new helper function - fscrypt_prepare_rename()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Introduce a helper function which prepares to rename a file into a
    possibly encrypted directory.  It handles loading the encryption keys
    for the source and target directories if needed, and it handles
    enforcing that if the target directory (and the source directory for a
    cross-rename) is encrypted, then the file being moved into the directory
    has the same encryption policy as its containing directory.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  7. fscrypt: new helper function - fscrypt_prepare_link()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Introduce a helper function which prepares to link an inode into a
    possibly-encrypted directory.  It handles setting up the target
    directory's encryption key, then verifying that the link won't violate
    the constraint that all files in an encrypted directory tree use the
    same encryption policy.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  8. fscrypt: new helper function - fscrypt_file_open()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Add a helper function which prepares to open a regular file which may be
    encrypted.  It handles setting up the file's encryption key, then
    checking that the file's encryption policy matches that of its parent
    directory (if the parent directory is encrypted).  It may be set as the
    ->open() method or it can be called from another ->open() method.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  9. fscrypt: new helper function - fscrypt_require_key()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Add a helper function which checks if an inode is encrypted, and if so,
    tries to set up its encryption key.  This is a pattern which is
    duplicated in multiple places in each of ext4, f2fs, and ubifs --- for
    example, when a regular file is asked to be opened or truncated.
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10. fscrypt: remove unneeded empty fscrypt_operations structs

    ebiggers authored and dianlujitao committed Oct 9, 2017
    In the case where a filesystem has been configured without encryption
    support, there is no longer any need to initialize ->s_cop at all, since
    none of the methods are ever called.
    
    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  11. fscrypt: remove ->is_encrypted()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Now that all callers of fscrypt_operations.is_encrypted() have been
    switched to IS_ENCRYPTED(), remove ->is_encrypted().
    
    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  12. fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED()

    ebiggers authored and dianlujitao committed Oct 9, 2017
    IS_ENCRYPTED() now gives the same information as
    i_sb->s_cop->is_encrypted() but is more efficient, since IS_ENCRYPTED()
    is just a simple flag check.  Prepare to remove ->is_encrypted() by
    switching all callers to IS_ENCRYPTED().
    
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  13. fs, fscrypt: add an S_ENCRYPTED inode flag

    ebiggers authored and dianlujitao committed Oct 9, 2017
    Introduce a flag S_ENCRYPTED which can be set in ->i_flags to indicate
    that the inode is encrypted using the fscrypt (fs/crypto/) mechanism.
    
    Checking this flag will give the same information that
    inode->i_sb->s_cop->is_encrypted(inode) currently does, but will be more
    efficient.  This will be useful for adding higher-level helper functions
    for filesystems to use.  For example we'll be able to replace this:
    
    	if (ext4_encrypted_inode(inode)) {
    		ret = fscrypt_get_encryption_info(inode);
    		if (ret)
    			return ret;
    		if (!fscrypt_has_encryption_key(inode))
    			return -ENOKEY;
    	}
    
    with this:
    
    	ret = fscrypt_require_key(inode);
    	if (ret)
    		return ret;
    
    ... since we'll be able to retain the fast path for unencrypted files as
    a single flag check, using an inline function.  This wasn't possible
    before because we'd have had to frequently call through the
    ->i_sb->s_cop->is_encrypted function pointer, even when the encryption
    support was disabled or not being used.
    
    Note: we don't define S_ENCRYPTED to 0 if CONFIG_FS_ENCRYPTION is
    disabled because we want to continue to return an error if an encrypted
    file is accessed without encryption support, rather than pretending that
    it is unencrypted.
    
    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  14. fscrypt: clean up include file mess

    Dave Chinner authored and dianlujitao committed Oct 9, 2017
    Filesystems have to include different header files based on whether they
    are compiled with encryption support or not. That's nasty and messy.
    
    Instead, rationalise the headers so we have a single include fscrypt.h
    and let it decide what internal implementation to include based on the
    __FS_HAS_ENCRYPTION define.  Filesystems set __FS_HAS_ENCRYPTION to 1
    before including linux/fscrypt.h if they are built with encryption
    support.  Otherwise, they must set __FS_HAS_ENCRYPTION to 0.
    
    Add guards to prevent fscrypt_supp.h and fscrypt_notsupp.h from being
    directly included by filesystems.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    [EB: use 1 and 0 rather than defined/undefined]
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  15. fscrypt: fix dereference of NULL user_key_payload

    ebiggers authored and dianlujitao committed Oct 9, 2017
    When an fscrypt-encrypted file is opened, we request the file's master
    key from the keyrings service as a logon key, then access its payload.
    However, a revoked key has a NULL payload, and we failed to check for
    this.  request_key() *does* skip revoked keys, but there is still a
    window where the key can be revoked before we acquire its semaphore.
    
    Fix it by checking for a NULL payload, treating it like a key which was
    already revoked at the time it was requested.
    
    Fixes: 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
    Reviewed-by: James Morris <james.l.morris@oracle.com>
    Cc: <stable@vger.kernel.org>    [v4.1+]
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
  16. fscrypt: make ->dummy_context() return bool

    ebiggers authored and dianlujitao committed Jun 22, 2017
    This makes it consistent with ->is_encrypted(), ->empty_dir(), and
    fscrypt_dummy_context_enabled().
    
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  17. ANDROID: sdcardfs: Add default_normal option

    Daniel Rosenberg authored and dianlujitao committed Jan 2, 2018
    The default_normal option causes mounts with the gid set to
    AID_SDCARD_RW to have user specific gids, as in the normal case.
    
    Signed-off-by: Daniel Rosenberg <drosen@google.com>
    Change-Id: I9619b8ac55f41415df943484dc8db1ea986cef6f
    Bug: 64672411
  18. ANDROID: sdcardfs: notify lower file of opens

    Daniel Rosenberg authored and dianlujitao committed Dec 21, 2017
    fsnotify_open is not called within dentry_open,
    so we need to call it ourselves.
    
    Change-Id: Ia7f323b3d615e6ca5574e114e8a5d7973fb4c119
    Signed-off-by: Daniel Rosenberg <drosen@google.com>
    Bug: 70706497