On 12/09/2014 11:31 πμ, Kevin Wolf wrote:
> Am 12.09.2014 um 09:04 hat Markus Armbruster geschrieben:
>> Stratos Psomadakis <psomas@grnet.gr> writes:
>>
>>> Make sure to pass the correct fd via SCM_RIGHTS in socket_scm_helper.c
>>> (i.e. fd_to_send, not socket-fd).
>>>
>>> Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
>>> Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
> Thanks, applied to the block branch.
>
> (Also thanks to Markus for copying me, would have missed the patch
> otherwise.)
>
>>>  tests/qemu-iotests/socket_scm_helper.c |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c
>>> index 0e2b285..8195983 100644
>>> --- a/tests/qemu-iotests/socket_scm_helper.c
>>> +++ b/tests/qemu-iotests/socket_scm_helper.c
>>> @@ -52,7 +52,7 @@ static int send_fd(int fd, int fd_to_send)
>>>      cmsg->cmsg_len = CMSG_LEN(sizeof(int));
>>>      cmsg->cmsg_level = SOL_SOCKET;
>>>      cmsg->cmsg_type = SCM_RIGHTS;
>>> -    memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
>>> +    memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int));
>>>  
>>>      do {
>>>          ret = sendmsg(fd, &msg, 0);
>> Ouch.  Do you have an idea what's broken without this fix?
> As far as I can tell, nothing. Test case 045 will send a different file
> descriptor than it intended to, but the file descriptors aren't used
> other than checking whether qemu correctly reports their existence, so
> it doesn't matter.
>
> I'm not adding qemu-stable therefore. Please correct me if I'm missing
> something.

Right. I mentioned qemu-stable mainly for the first patch.

Thanks,
Stratos

>
> Kevin


-- 
Stratos Psomadakis
<psomas@grnet.gr>