From 008930a84e31fc527abadebb9f2fbcf7bf172ab3 Mon Sep 17 00:00:00 2001 From: Srinivasarao P Date: Sun, 17 Oct 2021 09:54:33 +0530 Subject: [PATCH 1/3] ANDROID: ABI: Update allowed list for QCOM Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function void __sdhci_set_timeout(sdhci_host*, mmc_command*)' Bug: 203221370 Change-Id: I8ccdd4ceb851675f65a9428f62f563c8905631d0 Signed-off-by: Srinivasarao P --- android/abi_gki_aarch64.xml | 374 ++++++++++++++++++----------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 191 insertions(+), 184 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 5a3fe41bfbea..996410caf0ca 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -222,6 +222,7 @@ + @@ -28606,7 +28607,7 @@ - + @@ -31266,7 +31267,7 @@ - + @@ -48191,7 +48192,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48235,6 +48285,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -49081,55 +49151,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -49152,26 +49173,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -55828,97 +55829,97 @@ - - + + - - + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -85528,69 +85529,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -85610,9 +85611,9 @@ - + - + @@ -85623,50 +85624,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -85966,11 +85967,11 @@ - + - + @@ -85978,14 +85979,14 @@ - + - + - + @@ -107373,6 +107374,11 @@ + + + + + @@ -117293,7 +117299,7 @@ - + @@ -118723,6 +118729,11 @@ + + + + + @@ -118891,11 +118902,6 @@ - - - - - @@ -147318,7 +147324,7 @@ - + @@ -176942,7 +176948,7 @@ - + @@ -177231,7 +177237,7 @@ - + @@ -177329,7 +177335,7 @@ - + diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index ca0fde1b4462..d84202f3fd64 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -2118,6 +2118,7 @@ scsi_unblock_requests sdev_prefix_printk __sdhci_add_host + __sdhci_set_timeout sdhci_add_host sdhci_cleanup_host sdhci_cqe_disable From 0dedfe3f54f76ecc3bc28aca7e17e1af21173436 Mon Sep 17 00:00:00 2001 From: Mincheol Jeong Date: Tue, 19 Oct 2021 08:53:45 +0900 Subject: [PATCH 2/3] ANDROID: ABI: update allowed list for galaxy Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function int regulatory_set_wiphy_regd_sync_rtnl(wiphy*, ieee80211_regdomain*)' Bug: 203121344 Signed-off-by: Mincheol Jeong Change-Id: I5f5c4d14eebbfb5393bce35484ece9c863850ff1 --- android/abi_gki_aarch64.xml | 638 +++++++++++++++++---------------- android/abi_gki_aarch64_galaxy | 1 + 2 files changed, 323 insertions(+), 316 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 996410caf0ca..dcc8324e10ac 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -3417,6 +3417,7 @@ + @@ -28607,7 +28608,7 @@ - + @@ -31267,7 +31268,7 @@ - + @@ -32016,7 +32017,7 @@ - + @@ -48192,56 +48193,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -48285,26 +48237,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -49151,6 +49083,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49173,6 +49154,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -143414,7 +143415,7 @@ - + @@ -147324,7 +147325,7 @@ - + @@ -176948,7 +176949,7 @@ - + @@ -177237,7 +177238,7 @@ - + @@ -177335,7 +177336,7 @@ - + @@ -179042,157 +179043,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -179246,91 +179096,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -179345,6 +179110,24 @@ + + + + + + + + + + + + + + + + + + @@ -179447,6 +179230,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -179717,6 +179523,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -181312,7 +181313,7 @@ - + @@ -183675,6 +183676,11 @@ + + + + + @@ -183772,7 +183778,7 @@ - + @@ -183892,7 +183898,7 @@ - + diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy index 485f7c3a66d6..33da8c6ef4f7 100644 --- a/android/abi_gki_aarch64_galaxy +++ b/android/abi_gki_aarch64_galaxy @@ -1975,6 +1975,7 @@ regulator_unlock regulator_unregister_notifier regulatory_hint + regulatory_set_wiphy_regd_sync_rtnl release_firmware release_sock regmap_mmio_detach_clk From 3dbc1d366e44355bf1e1d3101423c8da33fc2fe4 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 14 Dec 2020 15:26:14 +0100 Subject: [PATCH 3/3] UPSTREAM: ovl: simplify file splice commit 82a763e61e2b601309d696d4fa514c77d64ee1be upstream. generic_file_splice_read() and iter_file_splice_write() will call back into f_op->iter_read() and f_op->iter_write() respectively. These already do the real file lookup and cred override. So the code in ovl_splice_read() and ovl_splice_write() is redundant. In addition the ovl_file_accessed() call in ovl_splice_write() is incorrect, though probably harmless. Fix by calling generic_file_splice_read() and iter_file_splice_write() directly. Bug: 203035944 Signed-off-by: Miklos Szeredi [reported to resolve issues with 1a980b8cbf00 ("ovl: add splice file read write helper")] Signed-off-by: Greg Kroah-Hartman Change-Id: I1b3c7610b27faad8eefa91dead167ceaeb4ff0d8 Signed-off-by: Greg Kroah-Hartman --- fs/overlayfs/file.c | 46 ++------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 91b75c6bfa57..2ae3a3db98aa 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -296,48 +296,6 @@ out_unlock: return ret; } -static ssize_t ovl_splice_read(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags) -{ - ssize_t ret; - struct fd real; - const struct cred *old_cred; - - ret = ovl_real_fdget(in, &real); - if (ret) - return ret; - - old_cred = ovl_override_creds(file_inode(in)->i_sb); - ret = generic_file_splice_read(real.file, ppos, pipe, len, flags); - revert_creds(old_cred); - - ovl_file_accessed(in); - fdput(real); - return ret; -} - -static ssize_t -ovl_splice_write(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) -{ - struct fd real; - const struct cred *old_cred; - ssize_t ret; - - ret = ovl_real_fdget(out, &real); - if (ret) - return ret; - - old_cred = ovl_override_creds(file_inode(out)->i_sb); - ret = iter_file_splice_write(pipe, real.file, ppos, len, flags); - revert_creds(old_cred); - - ovl_file_accessed(out); - fdput(real); - return ret; -} - static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync) { struct fd real; @@ -694,8 +652,8 @@ const struct file_operations ovl_file_operations = { .fadvise = ovl_fadvise, .unlocked_ioctl = ovl_ioctl, .compat_ioctl = ovl_compat_ioctl, - .splice_read = ovl_splice_read, - .splice_write = ovl_splice_write, + .splice_read = generic_file_splice_read, + .splice_write = iter_file_splice_write, .copy_file_range = ovl_copy_file_range, .remap_file_range = ovl_remap_file_range,