From owner-svn-src-all@freebsd.org  Tue Mar  8 15:55:44 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 A180AAC70E4;
 Tue,  8 Mar 2016 15:55:44 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74774F14;
 Tue,  8 Mar 2016 15:55:44 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u28FthFV022103;
 Tue, 8 Mar 2016 15:55:43 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u28FthsQ022102;
 Tue, 8 Mar 2016 15:55:43 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201603081555.u28FthsQ022102@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dchagin set sender to
 dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Tue, 8 Mar 2016 15:55:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296504 - head/sys/compat/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Mar 2016 15:55:44 -0000

Author: dchagin
Date: Tue Mar  8 15:55:43 2016
New Revision: 296504
URL: https://svnweb.freebsd.org/changeset/base/296504

Log:
  Does not leak fp. While here remove bogus cast of fp->f_data.
  
  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:15:34 2016	(r296503)
+++ head/sys/compat/linux/linux_socket.c	Tue Mar  8 15:55:43 2016	(r296504)
@@ -803,9 +803,12 @@ linux_accept_common(struct thread *td, i
 			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)
+			so = fp->f_data;
+			if (so->so_type == SOCK_DGRAM) {
+				fdrop(fp, td);
 				return (EOPNOTSUPP);
+			}
+			fdrop(fp, td);
 		}
 		return (error);
 	}