From owner-cvs-src-old@FreeBSD.ORG Thu Jun 4 15:10:46 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B6A610656CC for ; Thu, 4 Jun 2009 15:10:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17E428FC19 for ; Thu, 4 Jun 2009 15:10:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54FAjMp092215 for ; Thu, 4 Jun 2009 15:10:45 GMT (envelope-from kib@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54FAjTU092214 for cvs-src-old@freebsd.org; Thu, 4 Jun 2009 15:10:45 GMT (envelope-from kib@repoman.freebsd.org) Message-Id: <200906041510.n54FAjTU092214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kib@repoman.freebsd.org using -f From: Konstantin Belousov Date: Thu, 4 Jun 2009 15:10:29 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 Subject: cvs commit: src/sys/kern kern_descrip.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2009 15:10:46 -0000 kib 2009-06-04 15:10:29 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/kern kern_descrip.c Log: SVN rev 193438 on 2009-06-04 15:10:29Z by kib MFC r192094: Do not advance req->oldidx when sysctl_old_user returning an error due to copyout failure or short buffer. MFC r192144: Revert r192094. The revision caused problems for sysctl(3) consumers that expect that oldlen is filled with required buffer length even when supplied buffer is too short and returned error is ENOMEM. Redo the fix for kern.proc.filedesc, by reverting the req->oldidx when remaining buffer space is too short for the current kinfo_file structure. Also, only ignore ENOMEM. We have to convert ENOMEM to no error condition to keep existing interface for the sysctl, though. Revision Changes Path 1.313.2.18 +15 -2 src/sys/kern/kern_descrip.c