From patchwork Thu Aug 22 18:39:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 269136 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 08C432C00AC for ; Fri, 23 Aug 2013 04:39:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169Ab3HVSj3 (ORCPT ); Thu, 22 Aug 2013 14:39:29 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:59741 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753940Ab3HVSj0 (ORCPT ); Thu, 22 Aug 2013 14:39:26 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so2225856pdi.41 for ; Thu, 22 Aug 2013 11:39:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=EbSdB2Ay03ZkUa+YuqQCDwPyyr3QWvuW0Tl8tn5ajq8=; b=VdtwCfZ2d8b8utOa6iSwOa/6Lq8rvFDdxCGeM/YEIHKgaf0DN9vdzoZX5rKm/rAyvC HMwegarHT1cqTwfpdTlbqypuUwBRtBEKZsSBuiIypw4UnuSmOdpqpD8ArNPz2EqLpIg/ VMfK16bfI9PrSDQBJfaCfb5HUOiuP4yCr+fdvAyBTXjEWMJETuCjX3VaBaNOjNrVgdMa x5TOLIkP5Jofy0KwcBifYN8LPHXjqT/LZauVr7uaOaLODBsDXxkfAxty7VlzwIUUZYJ/ kcPImtAfquivq4O5BY4jzcSmfJI/r1ZqSv36Ic/P0M0t2jiDWVuH/WYH4h51/ROtZIpF GY/w== X-Gm-Message-State: ALoCoQmdXQe5a1axDvSLgBOvxqG9qz+c5RuQuCMi2xFdVB+aDbgNd7IhdOqYLoNTPSk2tDxQSpB5 X-Received: by 10.68.176.132 with SMTP id ci4mr14995670pbc.7.1377196765751; Thu, 22 Aug 2013 11:39:25 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id fl3sm18300884pad.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 22 Aug 2013 11:39:24 -0700 (PDT) From: Andy Lutomirski To: "Eric W. Biederman" , security@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Andy Lutomirski , stable@vger.kernel.org Subject: [PATCH 1/2] net: Check the correct namespace when spoofing pid over SCM_RIGHTS Date: Thu, 22 Aug 2013 11:39:15 -0700 Message-Id: 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 This is a security bug. The follow-up will fix nsproxy to discourage this type of issue from happening again. Cc: stable@vger.kernel.org Signed-off-by: Andy Lutomirski Reviewed-by: "Eric W. Biederman" --- net/core/scm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/scm.c b/net/core/scm.c index 03795d0..b4da80b 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -54,7 +54,7 @@ static __inline__ int scm_check_creds(struct ucred *creds) return -EINVAL; if ((creds->pid == task_tgid_vnr(current) || - ns_capable(current->nsproxy->pid_ns->user_ns, CAP_SYS_ADMIN)) && + ns_capable(task_active_pid_ns(current)->user_ns, CAP_SYS_ADMIN)) && ((uid_eq(uid, cred->uid) || uid_eq(uid, cred->euid) || uid_eq(uid, cred->suid)) || nsown_capable(CAP_SETUID)) && ((gid_eq(gid, cred->gid) || gid_eq(gid, cred->egid) ||