android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge android11-5.4.147+ (e785a25) into msm-5.4

Browse Source 
* refs/heads/tmp-e785a25:
  Revert "ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC"
  ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE()
  UPSTREAM: security: selinux: allow per-file labeling for bpffs
  ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC
  ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure
  ANDROID: f2fs: fix potential deadlock by android ftrace

Change-Id: I261a5fa5682452c021ad0ba4bb4da085ee340ab3
Signed-off-by: Srinivasarao Pathipati <quic_spathi@quicinc.com>
This commit is contained in:
Srinivasarao Pathipati 2021-11-25 14:14:50 +05:30
commit 2603172e50
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/GKI_VERSION
View File

@ -1 +1 @@
LTS_5.4.147_dc8c919ca616
LTS_5.4.147_e785a25f5262

8
fs/f2fs/data.c
View File

@ -3354,7 +3354,13 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
block_t blkaddr = NULL_ADDR;
int err = 0;
if (trace_android_fs_datawrite_start_enabled()) {
/*
* Should avoid quota operations which can make deadlock:
* kswapd -> f2fs_evict_inode -> dquot_drop ->
* f2fs_dquot_commit -> f2fs_write_begin ->
* d_obtain_alias -> __d_alloc -> kmem_cache_alloc(GFP_KERNEL)
*/
if (trace_android_fs_datawrite_start_enabled() && !IS_NOQUOTA(inode)) {
char *path, pathbuf[MAX_TRACE_PATHBUF_LEN];
path = android_fstrace_get_pathname(pathbuf,

4
fs/incfs/vfs.c
View File

@ -777,8 +777,10 @@ static struct dentry *open_or_create_index_dir(struct dentry *backing_dir)
err = vfs_mkdir(backing_inode, index_dentry, 0777);
inode_unlock(backing_inode);
if (err)
if (err) {
dput(index_dentry);
return ERR_PTR(err);
}
if (!d_really_is_positive(index_dentry)) {
dput(index_dentry);

2
include/linux/android_kabi.h
View File

@ -63,7 +63,7 @@
_new; \
struct { \
_orig; \
} __UNIQUE_ID(android_kabi_hide); \
}; \
__ANDROID_KABI_CHECK_SIZE_ALIGN(_orig, _new); \
}

1
security/selinux/hooks.c
View File

@ -758,6 +758,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
if (!strcmp(sb->s_type->name, "debugfs") ||
!strcmp(sb->s_type->name, "tracefs") ||
!strcmp(sb->s_type->name, "binder") ||
!strcmp(sb->s_type->name, "bpf") ||
!strcmp(sb->s_type->name, "pstore"))
sbsec->flags |= SE_SBGENFS;