Merge "msm: ADSPRPC: Handle third party applications" (d6ba2746) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/char/adsprpc.c

+31 −4

Original line number	Diff line number	Diff line
		@@ -198,7 +198,19 @@

		/* Fastrpc remote process attributes */
		enum fastrpc_proc_attr {
		FASTRPC_MODE_UNSIGNED_MODULE = (1 << 3),
		/* Macro for Debug attr */
		FASTRPC_MODE_DEBUG = 1 << 0,
		/* Macro for Ptrace */
		FASTRPC_MODE_PTRACE = 1 << 1,
		/* Macro for CRC Check */
		FASTRPC_MODE_CRC = 1 << 2,
		/* Macro for Unsigned PD */
		FASTRPC_MODE_UNSIGNED_MODULE = 1 << 3,
		/* Macro for Adaptive QoS */
		FASTRPC_MODE_ADAPTIVE_QOS = 1 << 4,
		/* Macro for System Process */
		FASTRPC_MODE_SYSTEM_PROCESS = 1 << 5,
		/* Macro for Prvileged Process */
		FASTRPC_MODE_PRIVILEGED = (1 << 6),
		};

		@@ -3752,6 +3764,9 @@ static int fastrpc_init_process(struct fastrpc_file *fl,
		{
		int err = 0;
		struct fastrpc_ioctl_init *init = &uproc->init;
		int cid = fl->cid;
		struct fastrpc_apps *me = &gfa;
		struct fastrpc_channel_ctx *chan = &me->channel[cid];

		VERIFY(err, init->filelen < INIT_FILELEN_MAX
		&& init->memlen < INIT_MEMLEN_MAX);
		@@ -3766,6 +3781,16 @@ static int fastrpc_init_process(struct fastrpc_file *fl,
		goto bail;
		}

		if (chan->unsigned_support && fl->dev_minor == MINOR_NUM_DEV) {
		/* Make sure third party applications */
		/* can spawn only unsigned PD when */
		/* channel configured as secure. */
		if (chan->secure && !(uproc->attrs & FASTRPC_MODE_UNSIGNED_MODULE)) {
		err = -ECONNREFUSED;
		goto bail;
		}
		}

		err = fastrpc_channel_open(fl);
		if (err)
		goto bail;
		@@ -5419,6 +5444,7 @@ static int fastrpc_get_info(struct fastrpc_file fl, uint32_t info)
		{
		int err = 0;
		uint32_t cid;
		struct fastrpc_apps *me = &gfa;

		VERIFY(err, fl != NULL);
		if (err)
		@@ -5427,8 +5453,9 @@ static int fastrpc_get_info(struct fastrpc_file fl, uint32_t info)
		err = fastrpc_set_process_info(fl);
		if (err)
		goto bail;
		if (fl->cid == -1) {
		cid = *info;
		if (fl->cid == -1) {
		struct fastrpc_channel_ctx *chan = &me->channel[cid];
		VERIFY(err, cid < NUM_CHANNELS);
		if (err) {
		err = -ECHRNG;
		@@ -5443,8 +5470,8 @@ static int fastrpc_get_info(struct fastrpc_file fl, uint32_t info)
		* offload. Untrusted apps will be restricted from
		* offloading to signed PD using DSP HAL.
		*/
		if (fl->apps->channel[cid].secure == SECURE_CHANNEL
		&& !fl->apps->channel[cid].unsigned_support) {
		if (chan->secure == SECURE_CHANNEL
		&& !chan->unsigned_support) {
		ADSPRPC_ERR(
		"cannot use domain %d with non-secure device\n",
		cid);