From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517180431-2-3493169158171625983 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=1517180431; b=vUlOA/1vK5m/PufJ4HKlGF9MBrbCWjNPJYOJVjrfJWxkBmY PVylSnwkl+hQDgWVdqapAcLLwRgn39vIucCAE8H7KWMEHp7t9OMfnzBMVExeCFj8 Pniim4ATauRdmIpREZhHBKIycqU/xLNppWO3Vo1TR6AlU9/xobuo331BuvNPdGZN Pli1XQPWr5ETquF9GNubY47MZKClOpnhWJ4GtXAKzXjZzk/R8Goyylt+NZh9XLyR 6qWK9nHcrianBazI0cOekrc5Tjhp1N6M0hKmqS1bgv27WtSMIFHQML0xV5PXazyr RhLJ8n2Uwhz8EsjY7xHhuHU2sV7vYo8n/2cHimw== 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=1517180431; bh=FCBkns EMmid6qbCQKcjgPvw2b8okvnRjk7OjUkJmLR4=; b=QU6hy0w79IzRhRKPoNqqaY 2JcHX2Qh29y1eTMUumJ4Hz66CFT3y16gNxK9l6cHzDKxZp6bKhNbzKSYHviVMR5b BPInNZ+r+fRTxYWr2ytT/Lbli6wARBqzpRyApmBmiPmuwa3XWu93jIWCN2/AzrqH /2XiofEUDxM26wBgrzwont+SNC3xhsSJdp0e0BhiKiZvLJ5ODWM5ezyqL/JVadeT /JP8ms0L4NdtI5ME10fHLEgELqXxXyZvxsnFj1c+j3zJn/kwV9vYs5pQAIpyZSb5 kLCMLpG9wsdLzVmbKzLwXsFmP77Re8QiUghBHcOC3ltLNOb00AEv4r3U0vjP8dlg == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=PNnWLHWl 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=PNnWLHWl 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 S1753557AbeA1W1w (ORCPT ); Sun, 28 Jan 2018 17:27:52 -0500 Received: from mail-bn3nam01on0128.outbound.protection.outlook.com ([104.47.33.128]:55858 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753540AbeA1W1u (ORCPT ); Sun, 28 Jan 2018 17:27:50 -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.14 081/100] netfilter: xt_osf: Add missing permission checks Thread-Topic: [PATCH AUTOSEL for 4.14 081/100] netfilter: xt_osf: Add missing permission checks Thread-Index: AQHTmIcYBjanD/PUgkamr2qRbm2UdA== Date: Sun, 28 Jan 2018 22:26:51 +0000 Message-ID: <20180128222547.7398-81-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MW2PR2101MB1018;7:pdTfgNoF+0H2+wzA5c4gu0BsUnAG8oFx/RwIPPZMi3jtogENvoj3+zq74dVOzQC6grBV55Tv+5jpKy+dMXv5yjb4Cuy/CL84hNniB7OfkUMmWD2CjFHw2IaAKff+c9shxGOjrNhYW9vbCtHpWnarnqTXEXT3M5Spx7sbeyTanTKlbqgQ0ser9CvaVj2QFaDN4mbJyUP26lgcKWivCBeubOb0SnRGo9BUvHdxPjLHmp3hk6hNvgdf+EZZQmT0l/u3 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ead5f036-e44e-4d6f-5478-08d5669e587e x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1018; x-ms-traffictypediagnostic: MW2PR2101MB1018: 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:MW2PR2101MB1018;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1018; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(199004)(189003)(53936002)(2501003)(6436002)(86362001)(6486002)(5250100002)(26005)(102836004)(6512007)(76176011)(6116002)(2900100001)(3846002)(36756003)(305945005)(7736002)(316002)(3660700001)(22452003)(3280700002)(54906003)(110136005)(99286004)(186003)(97736004)(1076002)(86612001)(81166006)(6666003)(2906002)(106356001)(14454004)(66066001)(4326008)(68736007)(5660300001)(25786009)(8936002)(10290500003)(81156014)(72206003)(107886003)(10090500001)(478600001)(2950100002)(105586002)(8676002)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1018;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: B4htpwbkOS5dsTa0NApMPf5hZwyHYOdrVC7Bsl2h0uSv+8jr5/Bv6NDM8pVOYToVSc9hqHuV5bpzD915pz3LeQ== 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: ead5f036-e44e-4d6f-5478-08d5669e587e X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:51.7346 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1018 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 36e14b1f061d..a34f314a8c23 100644 --- a/net/netfilter/xt_osf.c +++ b/net/netfilter/xt_osf.c @@ -19,6 +19,7 @@ #include #include =20 +#include #include #include #include @@ -70,6 +71,9 @@ static int xt_osf_add_callback(struct net *net, struct so= ck *ctnl, 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 @@ -115,6 +119,9 @@ static int xt_osf_remove_callback(struct net *net, stru= ct sock *ctnl, 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