diff options
| author | lucaswei <lucaswei@google.com> | 2020-06-10 22:51:56 +0800 |
|---|---|---|
| committer | lucaswei <lucaswei@google.com> | 2020-06-10 22:51:56 +0800 |
| commit | 3cb19815a576493208cbb1b20f9e9820761661ad (patch) | |
| tree | 66f070ef77826ecef2f60a074a8dc4f2d333c3c3 | |
| parent | 7cef5006280ec8a0d65843fac3cace11a7f8587b (diff) | |
| parent | 07e360796e13ec4dd54752a5d83e7a79e4ca528e (diff) | |
| download | data-kernel-android-msm-redbull-4.19-android11-qpr3.tar.gz | |
Merge LA.UM.9.12.R2.10.00.00.685.014 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19android-s-preview-2_r0.5android-s-preview-1_r0.5android-11.0.0_r0.95android-11.0.0_r0.86android-11.0.0_r0.81android-11.0.0_r0.76android-11.0.0_r0.66android-11.0.0_r0.57android-11.0.0_r0.56android-11.0.0_r0.47android-11.0.0_r0.46android-11.0.0_r0.33android-11.0.0_r0.32android-11.0.0_r0.27android-11.0.0_r0.26android-11.0.0_r0.18android-11.0.0_r0.16android-11.0.0_r0.115android-11.0.0_r0.105android-11.0.0_r0.100android-msm-redfin-4.19-android11-qpr1android-msm-redfin-4.19-android11-d1android-msm-redbull-4.19-s-preview-2android-msm-redbull-4.19-s-preview-1android-msm-redbull-4.19-android11-qpr3android-msm-redbull-4.19-android11-qpr2android-msm-bramble-4.19-android11-qpr1android-msm-bramble-4.19-android11-d1
Bug: 158429902
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: I055cafe491df95918248801595c73e3de3cb37ad
| -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); |