From owner-svn-src-all@freebsd.org Sat Dec 10 20:35:10 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 3BECEC716C7 for ; Sat, 10 Dec 2016 20:35:10 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 C729B1A0B for ; Sat, 10 Dec 2016 20:35:09 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x232.google.com with SMTP id g23so15301837wme.1 for ; Sat, 10 Dec 2016 12:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IKDbtrQa4tpKDtmTygeVseYxEfNHWa3TzkCF4CI6HQY=; b=058d8A/H0YRCBpUmNILHgi/95QYzbc3EMbrZAksiT+IlDn4zZGH29efUrjDWukktKv 4IRhKEPnAsZ1S1cuwvoLoHJ9lh7IU4XXw4/JrUxj38iHaxCL+mVxsBoBTlKfvUTmJQbs 6pDVRTJ6366pCL5JZzldhFVLlrwQNboY/Sb8bzEArU8JrsV+tuC4ExLFr3p5nFqkCcqb lUilXMgBve504zwYmhEFdg+LAF3Uh8q6x7wmbVoWU65r4lnwqQWhs423o8Z9t9TF7tuJ w1QUn2HIdwlBmuoF5GmhgwupUDxRRj4cucQfeGwrEntuWDys21h/hZE6JgHNoah9NMzV DGQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=IKDbtrQa4tpKDtmTygeVseYxEfNHWa3TzkCF4CI6HQY=; b=IL38GSMlEjxfqyhJiYHYPXh4xT7cUqw8ehJKcxaa6ZQY9JOeyjKODRKUcqkOeGk1Ho Uox78UqG3aUW1I7SH2Hwh8QUbL/qmw9OArZQ/hNDOAeqaozRp3C3RAViIiX73uOmButs zMdfG7/FlWDHLShKId+k+H6eNLSvvTea85IWkwZfz7dM8z7pV189W9fXjjtUEHQwqFXt QZmcQdA+lr4gG+cKS6iYWrjlskD3V7IHO8Sl4Q8bZlR9u0KvD7hWebxdkfTeVP6BZlaF ECATnBXNJOGjm5dBAoZLP35wBXOmVxPou2fGL4r0r0A6DCZYoRvsDH3AjFOARNlfevKq cuoQ== X-Gm-Message-State: AKaTC00a0P5oG1i/6crrTodREnnJkSQ3E1eOawLD9ttOvKsgmfb4CjnNN6LBOEd5n9X6EUYgXhtU6A6pDr3hAIiI X-Received: by 10.28.150.69 with SMTP id y66mr12379462wmd.107.1481402105280; Sat, 10 Dec 2016 12:35:05 -0800 (PST) MIME-Version: 1.0 Received: by 10.194.253.65 with HTTP; Sat, 10 Dec 2016 12:35:04 -0800 (PST) In-Reply-To: <201610211827.u9LIRUUi010303@repo.freebsd.org> References: <201610211827.u9LIRUUi010303@repo.freebsd.org> From: Oliver Pinter Date: Sat, 10 Dec 2016 21:35:04 +0100 Message-ID: Subject: Re: svn commit: r307745 - head/sys/kern To: Hiren Panchasara Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Lohith Bellad Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 10 Dec 2016 20:35:10 -0000 On 10/21/16, Hiren Panchasara wrote: > Author: hiren > Date: Fri Oct 21 18:27:30 2016 > New Revision: 307745 > URL: https://svnweb.freebsd.org/changeset/base/307745 > > Log: > Rework r306337. > > In sendit(), if mp->msg_control is present, then in sockargs() we are > allocating mbuf to store mp->msg_control. Later in kern_sendit(), call > to getsock_cap(), will check validity of file pointer passed, if this > fails EBADF is returned but mbuf allocated in sockargs() is not freed. > Made code changes to free the same. > > Since freeing control mbuf in sendit() after checking (control != NULL) > may lead to double freeing of control mbuf in sendit(), we can free > control mbuf in kern_sendit() if there are any errors in the routine. > > Submitted by: Lohith Bellad > Reviewed by: glebius > MFC after: 3 weeks > Differential Revision: https://reviews.freebsd.org/D8152 Hi Hiren! What's the status of the MFC? I not see them (this and r306337) in 11-STABLE nor in 10-STABLE branch. Thanks, Oliver > > Modified: > head/sys/kern/uipc_syscalls.c > > Modified: head/sys/kern/uipc_syscalls.c > ============================================================================== > --- head/sys/kern/uipc_syscalls.c Fri Oct 21 17:44:47 2016 (r307744) > +++ head/sys/kern/uipc_syscalls.c Fri Oct 21 18:27:30 2016 (r307745) > @@ -762,8 +762,10 @@ kern_sendit(struct thread *td, int s, st > cap_rights_set(&rights, CAP_CONNECT); > } > error = getsock_cap(td, s, &rights, &fp, NULL, NULL); > - if (error != 0) > + if (error != 0) { > + m_freem(control); > return (error); > + } > so = (struct socket *)fp->f_data; > > #ifdef KTRACE > @@ -774,12 +776,16 @@ kern_sendit(struct thread *td, int s, st > if (mp->msg_name != NULL) { > error = mac_socket_check_connect(td->td_ucred, so, > mp->msg_name); > - if (error != 0) > + if (error != 0) { > + m_freem(control); > goto bad; > + } > } > error = mac_socket_check_send(td->td_ucred, so); > - if (error != 0) > + if (error != 0) { > + m_freem(control); > goto bad; > + } > #endif > > auio.uio_iov = mp->msg_iov; > @@ -793,6 +799,7 @@ kern_sendit(struct thread *td, int s, st > for (i = 0; i < mp->msg_iovlen; i++, iov++) { > if ((auio.uio_resid += iov->iov_len) < 0) { > error = EINVAL; > + m_freem(control); > goto bad; > } > } > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >