From patchwork Tue Jul 2 16:39:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Droneaud X-Patchwork-Id: 256461 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D07F02C0077 for ; Wed, 3 Jul 2013 02:41:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430Ab3GBQkr (ORCPT ); Tue, 2 Jul 2013 12:40:47 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:44065 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753703Ab3GBQkb (ORCPT ); Tue, 2 Jul 2013 12:40:31 -0400 Received: from localhost.localdomain (unknown [37.161.30.250]) by smtp3-g21.free.fr (Postfix) with ESMTP id 5C5D6A6311; Tue, 2 Jul 2013 18:40:23 +0200 (CEST) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.14.7/8.14.5) with ESMTP id r62GeLoo005250; Tue, 2 Jul 2013 18:40:21 +0200 Received: (from ydroneaud@localhost) by localhost.localdomain (8.14.7/8.14.7/Submit) id r62GeLFG005249; Tue, 2 Jul 2013 18:40:21 +0200 From: Yann Droneaud To: linux-kernel@vger.kernel.org, linux-sctp@vger.kernel.org, netdev@vger.kernel.org Cc: Yann Droneaud Subject: [PATCH 12/13] sctp: use get_unused_fd_flags(0) instead of get_unused_fd() Date: Tue, 2 Jul 2013 18:39:36 +0200 Message-Id: <6d4271e2e0b05ae2728cba1d890e77cac50cf8f0.1372777600.git.ydroneaud@opteya.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Macro get_unused_fd() is used to allocate a file descriptor with default flags. Those default flags (0) can be "unsafe": O_CLOEXEC must be used by default to not leak file descriptor across exec(). Instead of macro get_unused_fd(), functions anon_inode_getfd() or get_unused_fd_flags() should be used with flags given by userspace. If not possible, flags should be set to O_CLOEXEC to provide userspace with a default safe behavor. In a further patch, get_unused_fd() will be removed so that new code start using anon_inode_getfd() or get_unused_fd_flags() with correct flags. This patch replaces calls to get_unused_fd() with equivalent call to get_unused_fd_flags(0) to preserve current behavor for existing code. The hard coded flag value (0) should be reviewed on a per-subsystem basis, and, if possible, set to O_CLOEXEC. Signed-off-by: Yann Droneaud Acked-by: Vlad Yasevich --- net/sctp/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 66fcdcf..caa5919 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4320,7 +4320,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval goto out; /* Map the socket to an unused fd that can be returned to the user. */ - retval = get_unused_fd(); + retval = get_unused_fd_flags(0); if (retval < 0) { sock_release(newsock); goto out;