Changeset 48bcf49 in mainline for kernel/generic/src/ipc/ops/stchngath.c
- Timestamp:
- 2017-09-28T22:08:15Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6636fb19
- Parents:
- dd20cbb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/ipc/ops/stchngath.c
rdd20cbb r48bcf49 45 45 task_t *other_task_s; 46 46 47 phone_t *sender_phone = phone_get_current(IPC_GET_ARG5(call->data)); 48 if (!sender_phone) 47 kobject_t *sender_obj = kobject_get(TASK, IPC_GET_ARG5(call->data), 48 KOBJECT_TYPE_PHONE); 49 if (!sender_obj) 49 50 return ENOENT; 50 51 51 mutex_lock(&sender_phone->lock); 52 if (sender_phone->state != IPC_PHONE_CONNECTED) { 53 mutex_unlock(&sender_phone->lock); 52 mutex_lock(&sender_obj->phone->lock); 53 if (sender_obj->phone->state != IPC_PHONE_CONNECTED) { 54 mutex_unlock(&sender_obj->phone->lock); 55 kobject_put(sender_obj); 54 56 return EINVAL; 55 57 } 56 58 57 other_task_s = sender_ phone->callee->task;59 other_task_s = sender_obj->phone->callee->task; 58 60 59 mutex_unlock(&sender_ phone->lock);61 mutex_unlock(&sender_obj->phone->lock); 60 62 61 63 /* Remember the third party task hash. */ 62 64 IPC_SET_ARG5(call->data, (sysarg_t) other_task_s); 63 65 66 kobject_put(sender_obj); 64 67 return EOK; 65 68 } … … 71 74 if (!IPC_GET_RETVAL(answer->data)) { 72 75 /* The recipient authorized the change of state. */ 73 phone_t *recipient_phone;74 76 task_t *other_task_s; 75 77 task_t *other_task_r; 76 78 77 recipient_phone = phone_get_current(IPC_GET_ARG1(answer->data)); 78 if (!recipient_phone) { 79 kobject_t *recipient_obj = kobject_get(TASK, 80 IPC_GET_ARG1(answer->data), KOBJECT_TYPE_PHONE); 81 if (!recipient_obj) { 79 82 IPC_SET_RETVAL(answer->data, ENOENT); 80 83 return ENOENT; 81 84 } 82 85 83 mutex_lock(&recipient_ phone->lock);84 if (recipient_ phone->state != IPC_PHONE_CONNECTED) {85 mutex_unlock(&recipient_ phone->lock);86 mutex_lock(&recipient_obj->phone->lock); 87 if (recipient_obj->phone->state != IPC_PHONE_CONNECTED) { 88 mutex_unlock(&recipient_obj->phone->lock); 86 89 IPC_SET_RETVAL(answer->data, EINVAL); 90 kobject_put(recipient_obj); 87 91 return EINVAL; 88 92 } 89 93 90 other_task_r = recipient_ phone->callee->task;94 other_task_r = recipient_obj->phone->callee->task; 91 95 other_task_s = (task_t *) IPC_GET_ARG5(*olddata); 92 96 … … 109 113 } 110 114 111 mutex_unlock(&recipient_phone->lock); 115 mutex_unlock(&recipient_obj->phone->lock); 116 kobject_put(recipient_obj); 112 117 } 113 118
Note:
See TracChangeset
for help on using the changeset viewer.