From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1164045-1517178612-2-7366458290867790868 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517178611; b=TTH3lP5zThewSTHYSSCaIP0enjgJaGwjSrB8VO9ImMH87hD PslDhZVBoYZ2aTkrhd/7541/0ffzfAgedN5Ltap0HzZ+CTCLtnVrx6vLVce8DIFH aYda5cutXvZwIh45LVaUVxDBIn8qGaDLsgEeGBtZEOnhfXrYsBMfwD8KsWSr3+oJ giRiPTQJxcaZLeUwi+nHzimyU6CLzPFBJ8fgYvUXuGvMMpO4lQnHcREBDDImI+Hh DW7NQuwrJMO4tHFiJhEsglFZUVxdDh++zyuiV/hnNsjcTVAdvBPL/gHil1GmmW3k g9dhvdS7HbFVbJSmJN/ASDzxjgF+pwSWTR8xe0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517178611; bh=6UKAvI PukZc2RM5NkyCsQJS3pb3U+uxJ9L6IBcla8jc=; b=FwmefpoMouYcq8Gs69YKtC VQEl+n1gzPSUHx9aZtPxgACUvMXyGhKu8pKA5/T6bjFu7CzIV6S9dzTN5XCPvZTo LCn4W8bjjiNOj6ZLNgT1KURMYT/s2OyyqA3Ii9L2sNSpKLGvfRucjlHsvHRh6zOu GHr5YN570LxkLmwplkblo+8auZWc511W5pX44f60UxTC3fsGZamgNVCH/rFW06Ky gsqFP7n42RCNd0zLX0ZIeHZonXfq9nqBebwriiwvxnmyS9RnWoJ1gurZzmhKaZry 3srMyt+IGP1Wc1FWkliRSlEdXWpmA80iZmwb/irNUbN8yb5h6r2A3UWWsgm9Ooyw == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=frWWNRAu x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=frWWNRAu x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753518AbeA1WaH (ORCPT ); Sun, 28 Jan 2018 17:30:07 -0500 Received: from mail-by2nam03on0094.outbound.protection.outlook.com ([104.47.42.94]:9952 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932462AbeA1W36 (ORCPT ); Sun, 28 Jan 2018 17:29:58 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Kevin Cernekee , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 27/36] netfilter: xt_osf: Add missing permission checks Thread-Topic: [PATCH AUTOSEL for 4.4 27/36] netfilter: xt_osf: Add missing permission checks Thread-Index: AQHTmIdaN4efh8zfSEKFI/T3Kyh0PA== Date: Sun, 28 Jan 2018 22:28:42 +0000 Message-ID: <20180128222815.29479-27-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1114;7:fo4vzq4lqnbrEdNEyTklamDApworepGDk/gcPDzPyRtP1fihYUAlQFYejpB7o6+xoQuQrFqcOgu7iurUAcdzlvPr98sL0H4NFPeHfY/6YWvY8R75t6SqvBAATNKcifw6hvN1/ApFMhfxDyDHtWXiOEyutFiQkW1K9Z59WUco80PkBU14Ue/XbuyrJTteudF7n7YfNXvUYbMRPKDBdN4EBfA4sziY+6C5qS4hn4dUGZCZ9bi3t3d+DdY6pv0/swB+ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f0381075-84fa-47b1-3a37-08d5669ea6c0 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(575784001)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: cHZgqqx5liwLFb3bJ6JUH0U0lxkgDeT64AOXF+oBkkbEOwQ2OIfliNg4d3UJ2e8hAdTHO8qpidqNJHoAImPlBA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0381075-84fa-47b1-3a37-08d5669ea6c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:42.7525 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Kevin Cernekee [ Upstream commit 916a27901de01446bcf57ecca4783f6cff493309 ] The capability check in nfnetlink_rcv() verifies that the caller has CAP_NET_ADMIN in the namespace that "owns" the netlink socket. However, xt_osf_fingers is shared by all net namespaces on the system. An unprivileged user can create user and net namespaces in which he holds CAP_NET_ADMIN to bypass the netlink_net_capable() check: vpnns -- nfnl_osf -f /tmp/pf.os vpnns -- nfnl_osf -f /tmp/pf.os -d These non-root operations successfully modify the systemwide OS fingerprint list. Add new capable() checks so that they can't. Signed-off-by: Kevin Cernekee Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/xt_osf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/netfilter/xt_osf.c b/net/netfilter/xt_osf.c index df8801e02a32..7eae0d0af89a 100644 --- a/net/netfilter/xt_osf.c +++ b/net/netfilter/xt_osf.c @@ -19,6 +19,7 @@ #include #include =20 +#include #include #include #include @@ -69,6 +70,9 @@ static int xt_osf_add_callback(struct sock *ctnl, struct = sk_buff *skb, struct xt_osf_finger *kf =3D NULL, *sf; int err =3D 0; =20 + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + if (!osf_attrs[OSF_ATTR_FINGER]) return -EINVAL; =20 @@ -112,6 +116,9 @@ static int xt_osf_remove_callback(struct sock *ctnl, st= ruct sk_buff *skb, struct xt_osf_finger *sf; int err =3D -ENOENT; =20 + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + if (!osf_attrs[OSF_ATTR_FINGER]) return -EINVAL; =20 --=20 2.11.0