mirror of
				https://gitlab.freedesktop.org/wayland/wayland.git
				synced 2025-11-03 09:01:42 -05:00 
			
		
		
		
	wayland-server: Abort if a read from a client gives 0 length
This happens on EOF if using a poll function such as select() or kqueue() which doesn’t distinguish EOF events. Currently execution should never reach the point where recvmsg() returns EOF (len == 0). Instead, epoll() will detect this and indicate EPOLLHUP, which is handled a few lines above, closing the connection. However, other event mechanisms may not be able to distinguish EOF from regular readability (in the case of select()) or inconsistently across platforms (in the case of POLLHUP). There is also the possibility of half-closed connections (shutdown(), POLLRDHUP), though this may not be an issue with Wayland. This will not cause problems if the FD polls as readable but actually is not — in that case, recvmsg() will return EAGAIN. Signed-off-by: Philip Withnall <philip at tecnocode.co.uk> Signed-off-by: Karsten Otto <ottoka at posteo.de> Reviewed-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
		
							parent
							
								
									b096693bef
								
							
						
					
					
						commit
						a434b7ba8e
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
					@ -260,7 +260,7 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
 | 
				
			||||||
	len = 0;
 | 
						len = 0;
 | 
				
			||||||
	if (mask & WL_EVENT_READABLE) {
 | 
						if (mask & WL_EVENT_READABLE) {
 | 
				
			||||||
		len = wl_connection_read(connection);
 | 
							len = wl_connection_read(connection);
 | 
				
			||||||
		if (len < 0 && errno != EAGAIN) {
 | 
							if (len == 0 || (len < 0 && errno != EAGAIN)) {
 | 
				
			||||||
			wl_client_destroy(client);
 | 
								wl_client_destroy(client);
 | 
				
			||||||
			return 1;
 | 
								return 1;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue