From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517178802-2-4361428890853386776 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 enda, 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=1517178802; b=Hm/2MVrgy+L+ed960YccSZd8UE4o5MhokMDzxJQeftLGXrW CqGaDnoZVfDziNbEt8m2s+xfz27W1FfaMUCDKyFrwLaqBjqPW/qAPLwVCqxFBCQO 3v6UbQjZlkqFJ2pwfIdydMyJR4qCdscnuALnSfiZ58ehIGrnqQug5ksw0HqUqhJr UTPlHUOfEvqg/ttyjKRUeOC+bz8RbxUW58ttEldsyNDNrTZ+8zFo+ZbZYCPzY42j 6pxjtbuvrlHXi9gmqtPoYL0shkhRpaQHcR4EZE9ZAMLa0zQmxm1yDppDNhqfXXb6 SOPuaHAsIpRo5lyUcZMkDnrE7t+QCWx06aiHqHw== 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=1517178802; bh=P7Kh1B wS/36vDLyuMoHUNXypl6NFPNbK2GfQ0ZZrTQ8=; b=tT0Lno2rC8GUaXCnbKtGxu 5KlY4A6KkipNQjNqZefX+OMazk639mV4Jq8P4Ih8HyLRYeK6kmmM/eySWtfH8pxX V5FYV1aSxQ26VC3BuSkQWFzZ6CRl4y7dtE13Ue2oVSiJDkNpsPdxu6DSGCS3x9Hd a2Vkq4nAh80dbBto9khSpkV5TP0VLC3vCsrsxG2D1VOsX9R9j0H5+yGaUHohSWYo LUpyyFiDe/doWv0P/Hmdhe0/Fu+RU92L9kzIljBhlwfAsX6QxHG+evYTv7arVBH5 KSVrMmYL5jRE0VYn/GPDeuRvhhxwf1LD3A7GwIst2c5kwU4zuVaX6BdBU5MwaTPA == 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=R7itudmL 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=R7itudmL 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 S932647AbeA1WdT (ORCPT ); Sun, 28 Jan 2018 17:33:19 -0500 Received: from mail-bl2nam02on0093.outbound.protection.outlook.com ([104.47.38.93]:45074 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932645AbeA1Wal (ORCPT ); Sun, 28 Jan 2018 17:30:41 -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 3.18 18/25] netfilter: xt_osf: Add missing permission checks Thread-Topic: [PATCH AUTOSEL for 3.18 18/25] netfilter: xt_osf: Add missing permission checks Thread-Index: AQHTmIeGoRvaMsKHQUu/s3ILI7+xRw== Date: Sun, 28 Jan 2018 22:29:56 +0000 Message-ID: <20180128222931.7781-18-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-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;MW2PR2101MB1098;7:e7baatEULdeQf0eAoIdp8SLklXRiYBNzcdfLYUfKcKfn2RB7gFQpw2Qe0OUa2Jt2bq2m/mH1cg8Uxq1nKx96zjb95xYMphYK6VQ/aJnsBefhtqJ/fqnYmXiyLpzsYgxBFOz0zdRlWtggfgTXhqKJFX6x0xDE2RgLYyp2GMBnYShntviYoGQNvT77FvZCwWvT9UmlU4RfS5nRI+gkHNsBHfZWBPfJOuYy+O8pjtPcYNSUKQGSUnZ1i4BcqPBV4p6n x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3cb70fa0-1157-4c0e-4719-08d5669ebffb x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: 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)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: NUuzLcmFzmyXBAryAwFQPEtz0jEIjU9z9asW8Ig7ilfm/Kd1W6UKZUsYwoQFD3hSHVTrVErQfkoGIlMZvdQaJA== 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: 3cb70fa0-1157-4c0e-4719-08d5669ebffb X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:56.3877 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 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 c529161cdbf8..99f3146b7337 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