diff options
author | Roger Liao <rogerliao@google.com> | 2020-06-24 18:45:24 +0800 |
---|---|---|
committer | Roger Liao <rogerliao@google.com> | 2020-06-24 18:45:28 +0800 |
commit | 82e681778aed7f986e40b92f799585304db29928 (patch) | |
tree | 66f070ef77826ecef2f60a074a8dc4f2d333c3c3 | |
parent | 4d72067cc84697712a824dcdfcb80e404485a4a2 (diff) | |
parent | 3cb19815a576493208cbb1b20f9e9820761661ad (diff) | |
download | data-kernel-android-msm-barbet-4.19-android11-d2.tar.gz |
Merge branch 'android-msm-pixel-4.19' into android-msm-barbet-4.19android-11.0.0_r0.116android-11.0.0_r0.110android-11.0.0_r0.106android-msm-barbet-4.19-android11-d2
Merge from build 6619817
Align to LA.UM.9.12.R2.10.00.00.685.014
Bug: 159778850
Signed-off-by: Roger Liao <rogerliao@google.com>
Change-Id: I6dac22e693c4ffe5cdc8586b40f6439e324293ed
-rw-r--r-- | drivers/rmnet/shs/rmnet_shs_wq.c | 3 | ||||
-rw-r--r-- | drivers/rmnet/shs/rmnet_shs_wq_mem.c | 9 | ||||
-rw-r--r-- | drivers/rmnet/shs/rmnet_shs_wq_mem.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/drivers/rmnet/shs/rmnet_shs_wq.c b/drivers/rmnet/shs/rmnet_shs_wq.c index f300c22..6b2a31e 100644 --- a/drivers/rmnet/shs/rmnet_shs_wq.c +++ b/drivers/rmnet/shs/rmnet_shs_wq.c @@ -2149,7 +2149,8 @@ void rmnet_shs_wq_init(struct net_device *dev) return; } - rmnet_shs_wq_mem_init(); + if( rmnet_shs_wq_mem_init() ) + rmnet_shs_wq_genl_deinit(); trace_rmnet_shs_wq_high(RMNET_SHS_WQ_INIT, RMNET_SHS_WQ_INIT_START, 0xDEF, 0xDEF, 0xDEF, 0xDEF, NULL, NULL); diff --git a/drivers/rmnet/shs/rmnet_shs_wq_mem.c b/drivers/rmnet/shs/rmnet_shs_wq_mem.c index e914d78..7c5dbad 100644 --- a/drivers/rmnet/shs/rmnet_shs_wq_mem.c +++ b/drivers/rmnet/shs/rmnet_shs_wq_mem.c @@ -953,13 +953,19 @@ void rmnet_shs_wq_mem_update_cached_netdevs(void) } /* Creates the proc folder and files for shs shared memory */ -void rmnet_shs_wq_mem_init(void) +int rmnet_shs_wq_mem_init(void) { kuid_t shs_uid; kgid_t shs_gid; shs_proc_dir = proc_mkdir("shs", NULL); + if(!shs_proc_dir) + { + rm_err("%s", "SHS_MEM: shs_proc_dir returned as NULL\n"); + return -1; + } + shs_uid = make_kuid(&init_user_ns, 1001); shs_gid = make_kgid(&init_user_ns, 1001); @@ -977,6 +983,7 @@ void rmnet_shs_wq_mem_init(void) ssflow_shared = NULL; netdev_shared = NULL; rmnet_shs_wq_ep_unlock_bh(); + return 0; } /* Remove shs files and folders from proc fs */ diff --git a/drivers/rmnet/shs/rmnet_shs_wq_mem.h b/drivers/rmnet/shs/rmnet_shs_wq_mem.h index e955606..374a556 100644 --- a/drivers/rmnet/shs/rmnet_shs_wq_mem.h +++ b/drivers/rmnet/shs/rmnet_shs_wq_mem.h @@ -107,7 +107,7 @@ void rmnet_shs_wq_mem_update_cached_sorted_gold_flows(struct list_head *gold_flo void rmnet_shs_wq_mem_update_cached_sorted_ss_flows(struct list_head *ss_flows); void rmnet_shs_wq_mem_update_cached_netdevs(void); -void rmnet_shs_wq_mem_init(void); +int rmnet_shs_wq_mem_init(void); void rmnet_shs_wq_mem_deinit(void); |