From patchwork Thu Dec 20 06:25:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 10738549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E231014E2 for ; Thu, 20 Dec 2018 06:25:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD50928701 for ; Thu, 20 Dec 2018 06:25:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C19382870B; Thu, 20 Dec 2018 06:25:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D02F28701 for ; Thu, 20 Dec 2018 06:25:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729257AbeLTGZz (ORCPT ); Thu, 20 Dec 2018 01:25:55 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:39984 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727943AbeLTGZz (ORCPT ); Thu, 20 Dec 2018 01:25:55 -0500 Received: by mail-pf1-f194.google.com with SMTP id i12so413655pfo.7 for ; Wed, 19 Dec 2018 22:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=N5gsvG/QQQpZBPOT8+YsI8YuEozqPi8StkaMVrlfy9c=; b=byK2BWg+Y/B3KofXicxjyfBon9wmfYesCc1qDCja49bEQ+xlWwakkB2YWbBY5KcWc1 zhAVKUpGC1rI8bhToYEN/eSRKsg169VkcyoDCFZhSu+PJP01GLrriXc0/EUnSWshJYRr tlv2NLJBiKFNwh71g8Ro+1gd60xR8dXrMnfRF6aAXjIhOK7rvNSAvBVdcrphC7eGR0wp V4/oL+l26d37AVQbIYKSEAHZIg/BKPOTeSSa32n+G7GuZu2aXoNmpdfR5cTQ27fAi9Xy sTlx/UjlAQpo309BT1zh/+6YGjBWLmr5iY7Q21siI31JdrrWglaJ+5IILcX5UmLOg04h ewHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=N5gsvG/QQQpZBPOT8+YsI8YuEozqPi8StkaMVrlfy9c=; b=knh5/beco5TSEZrdmJCJNR15R1XLnoM5zShX0mcgQPJoPnEJ6Xt++CDFaEFbS9X8rD SVp0/56XZNX3IvnxyOxUIW7TsuIgVBBr/eocgQCJVP7dHhYLwpmHmjXvgezsxIEqb3es JF2/NCgBDK5MCDRzFVtYGP5ZKlb7lcrctbCF6tKY4tfswf0Fkn0M3MuBDUOboFUh9YTl yBh5egj1rWYGugj6JxNlWB2m7Mi9hEzljc6EmwGfNoVogPV4GUT8l5uKa7AGgufLty6o BO/6OBqBYLCLlBJ/kaXhS2gy0vmCQBEj1owrskrTqltul/y5Hv5Fxv4cnof5XqVNtqFg P7JQ== X-Gm-Message-State: AA+aEWY4A3x2RlECBaXBBpncY6G7AeSVthR8Y02fVjoJAyumlyMd995W KUc9XcKEFjlbgNcuqmOEGp0= X-Google-Smtp-Source: AFSGD/V/kAOD1NA2Km2Sk7bFcVVEx4jNKLpkx4tD8fjaIRmWrcayx0kTE5s6Z7/NCN2TVb94GuM6iw== X-Received: by 2002:a65:6392:: with SMTP id h18mr5606558pgv.107.1545287154695; Wed, 19 Dec 2018 22:25:54 -0800 (PST) Received: from localhost.localdomain (c-73-140-212-29.hsd1.wa.comcast.net. [73.140.212.29]) by smtp.gmail.com with ESMTPSA id d3sm23350618pgl.64.2018.12.19.22.25.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Dec 2018 22:25:54 -0800 (PST) From: Andrei Vagin To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, Andrei Vagin Subject: [PATCH vfs/for-next] smack: fix parsing mount options Date: Wed, 19 Dec 2018 22:25:41 -0800 Message-Id: <20181220062541.12348-1-avagin@gmail.com> X-Mailer: git-send-email 2.17.2 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Recent changes removed "smack" prefix from smack mount options. Fixes: 53c1d44b9071 ("smack: rewrite smack_sb_eat_lsm_opts()") Signed-off-by: Andrei Vagin --- security/smack/smack_lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 603ed7d20ab4..11da1e2531c8 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -61,7 +61,7 @@ static LIST_HEAD(smk_ipv6_port_list); static struct kmem_cache *smack_inode_cache; int smack_enabled; -#define A(s) {#s, sizeof(#s) - 1, Opt_##s} +#define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s} static struct { const char *name; int len;