Merge android-msm-pixel-4.19-tm-qpr1 into android-msm-pixel-4.19-tm-qpr2
SBMerger: 478053055
Change-Id: Ia131a32e0d30f3e075ce86f62b3e4fa4960f0413
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 0f6a045..013de26 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -2562,6 +2562,12 @@
remote_arg_t ra[1];
int tgid = fl->tgid;
+ if (fl->dev_minor == MINOR_NUM_DEV) {
+ err = -ECONNREFUSED;
+ pr_err("adsprpc: %s: untrusted app trying to attach to privileged DSP PD\n",
+ __func__);
+ return err;
+ }
ra[0].buf.pv = (void *)&tgid;
ra[0].buf.len = sizeof(tgid);
ioctl.inv.handle = FASTRPC_STATIC_HANDLE_PROCESS_GROUP;
@@ -2702,6 +2708,13 @@
unsigned int pageslen;
} inbuf;
+ if (fl->dev_minor == MINOR_NUM_DEV) {
+ err = -ECONNREFUSED;
+ pr_err("adsprpc: %s: untrusted app trying to attach to audio PD\n",
+ __func__);
+ return err;
+ }
+
if (!init->filelen)
goto bail;
