Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jun 2016 07:45:56 +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-9@freebsd.org
Subject:   svn commit: r301432 - stable/9/sys/compat/linux
Message-ID:  <201606050745.u557juhf077914@repo.freebsd.org>

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

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

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

Modified: stable/9/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/9/sys/compat/linux/linux_ioctl.c	Sun Jun  5 07:43:20 2016	(r301431)
+++ stable/9/sys/compat/linux/linux_ioctl.c	Sun Jun  5 07:45:55 2016	(r301432)
@@ -974,7 +974,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?201606050745.u557juhf077914>