From owner-svn-src-all@freebsd.org Tue Mar 8 15:55:31 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55086AC7021; Tue, 8 Mar 2016 15:55:31 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E3852C1F; Tue, 8 Mar 2016 15:55:30 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm0-x22b.google.com with SMTP id l68so155931423wml.0; Tue, 08 Mar 2016 07:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=vB7ZwOd5NG9hcaJwDk0S4ObswOeAuMgQ6cxGqEeunLA=; b=kvgasKHBezs7FATAS4Q0cFh2+XpPFL0ESiNFt4A4vFKbtBLX6iWrVqAJXcjCxmZF3Q cunCdF0uamQmVHp0u3qpCqVC/N8olbtN2Al0k+Oqo7uaByLu1MkMjK7OHH/9Y/W2IVTu YAoCG1GClOVAKD5ZFZtzix/Zlc39bM8sayg3Moe9VMpPZCGk2oLjAiyw+7cuBpTzxO62 KBENEXuQY9gjp5dXZOFnwrhl4dWuD3H9DVyzp+kLFAW3DX5GL4OHFVmCq2yoKwAuBoyw kTK8iIiZUvqhZhJbMORMgf7b2xOzpB26QUsUGAr82FePZnoIgf5LPOgsNGZYu+yLnf8O EtiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=vB7ZwOd5NG9hcaJwDk0S4ObswOeAuMgQ6cxGqEeunLA=; b=L+QRKVWBQYDIfQPZ0V4/NlfR1v3IQINxZuZ44AwaKvUiS5wp7NTsrxL/z196NinJkw mPCvaJxQgSowXGtl9NzOWPcfIS9pSHXJGzZATkWiFsfwgaJdAJalPG7BvJDx44pa7/EP pRI0p/InVatteTNdogvRY8sAjINWkjzyI197UTWCnKBhtwH7FGkdeEkZ87kY3x2VaHDt mOQP/8s1xMfVCdohuaRAOiF/yq4WuTvm9zQ9NzezpFYFhn/rR81aGbiEXZwsGaB9z85H 7LEvyl8GMKsepuH7pzwwSnrqvUQhHJDn+hX2lGDYnpUg3XCENxmaOcK59hZA3TzJ+/Tn ul2w== X-Gm-Message-State: AD7BkJLzj9HmdPBI/XwHEKu7+/M3o5CLmUB513j1XJyJSfU1xE+LB1MTHm1LVs/exxt0nw== X-Received: by 10.28.24.130 with SMTP id 124mr20895327wmy.50.1457452528914; Tue, 08 Mar 2016 07:55:28 -0800 (PST) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by smtp.gmail.com with ESMTPSA id p191sm28678345wmb.0.2016.03.08.07.55.28 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 08 Mar 2016 07:55:28 -0800 (PST) Date: Tue, 8 Mar 2016 16:55:26 +0100 From: Mateusz Guzik To: Dmitry Chagin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r296503 - head/sys/compat/linux Message-ID: <20160308155526.GB7447@dft-labs.eu> References: <201603081515.u28FFYhu008909@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201603081515.u28FFYhu008909@repo.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2016 15:55:31 -0000 On Tue, Mar 08, 2016 at 03:15:34PM +0000, Dmitry Chagin wrote: > Author: dchagin > Date: Tue Mar 8 15:15:34 2016 > New Revision: 296503 > URL: https://svnweb.freebsd.org/changeset/base/296503 > > Log: > Linux accept() system call return EOPNOTSUPP errno instead of EINVAL > for UDP sockets. > > MFC after: 1 week > > Modified: > head/sys/compat/linux/linux_socket.c > > Modified: head/sys/compat/linux/linux_socket.c > ============================================================================== > --- head/sys/compat/linux/linux_socket.c Tue Mar 8 15:12:49 2016 (r296502) > +++ head/sys/compat/linux/linux_socket.c Tue Mar 8 15:15:34 2016 (r296503) > @@ -781,7 +781,10 @@ linux_accept_common(struct thread *td, i > socklen_t * __restrict anamelen; > int flags; > } */ bsd_args; > - int error; > + cap_rights_t rights; > + struct socket *so; > + struct file *fp; > + int error, error1; > > bsd_args.s = s; > /* XXX: */ > @@ -796,6 +799,14 @@ linux_accept_common(struct thread *td, i > if (error) { > if (error == EFAULT && namelen != sizeof(struct sockaddr_in)) > return (EINVAL); > + if (error == EINVAL) { > + error1 = getsock_cap(td, s, &rights, &fp, NULL); > + if (error1 != 0) > + return (error1); > + so = (struct socket *)fp->f_data; > + if (so->so_type == SOCK_DGRAM) > + return (EOPNOTSUPP); > + } > return (error); > } > if (addr) What drops the reference obtained from getsock_cap? Also the race due to double fd lookup, while fine enough for this purpose, should be documented as accepted. -- Mateusz Guzik