Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jun 2016 07:40:13 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r301430 - stable/10/sys/compat/linux
Message-ID:  <201606050740.u557eDmP074399@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dchagin
Date: Sun Jun  5 07:40:12 2016
New Revision: 301430
URL: https://svnweb.freebsd.org/changeset/base/301430

Log:
  MFC r300569:
  
  Don't leak fp in case where fo_ioctl() returns an error.
  
  Reported by:	C Turt <ecturt@gmail.com>

Modified:
  stable/10/sys/compat/linux/linux_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/10/sys/compat/linux/linux_ioctl.c	Sun Jun  5 07:38:56 2016	(r301429)
+++ stable/10/sys/compat/linux/linux_ioctl.c	Sun Jun  5 07:40:12 2016	(r301430)
@@ -978,7 +978,7 @@ linux_ioctl_termio(struct thread *td, st
 		error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line,
 		    td->td_ucred, td);
 		if (error)
-			return (error);
+			break;
 		switch (bsd_line) {
 		case TTYDISC:
 			linux_line = LINUX_N_TTY;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606050740.u557eDmP074399>