From patchwork Fri Apr 7 21:17:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Brandenburg X-Patchwork-Id: 9670491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A0D66602B3 for ; Fri, 7 Apr 2017 21:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9434128663 for ; Fri, 7 Apr 2017 21:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8923328666; Fri, 7 Apr 2017 21:20:24 +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=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 1A2CB28663 for ; Fri, 7 Apr 2017 21:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756671AbdDGVTj (ORCPT ); Fri, 7 Apr 2017 17:19:39 -0400 Received: from mail-yb0-f175.google.com ([209.85.213.175]:35271 "EHLO mail-yb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756319AbdDGVRo (ORCPT ); Fri, 7 Apr 2017 17:17:44 -0400 Received: by mail-yb0-f175.google.com with SMTP id f204so19881041ybc.2 for ; Fri, 07 Apr 2017 14:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=omnibond-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4GHsrWmRpYYklA81hrgZwxhRKOhR2sm2/qxunrudjLo=; b=hK+5hdQqbkk96cZ7yn2a189dxF7Uo1DzcEqmBH9pGlEf9/EtUiYHZZZ9BGBw2XuyTK EI3VPtuMpYWEkXsArTg1el+7k3T/VaB4N2gT4CD2QYI3RtnAN/ytSt9t990Wew0QQR4c eVzE8Mdp0zQfe+snWZvUCTmeNQdxncEEqrLgUCee6N3zuc/y2CE+8IRbDtMwvKWVNR92 ShcKjaMLAcsikDoQpiUjKQQe4ZN+K2e5ya+weSUIQOXah3Z8TCfLZc3ZmyB9Dt3By5mc dc2C1J44m2kqMToYPZrW3O8z4ZUXDQpK63SPfdOCcyDEo7/R80S+oKq0reW6rSJMU2E/ 0SJQ== 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:in-reply-to :references; bh=4GHsrWmRpYYklA81hrgZwxhRKOhR2sm2/qxunrudjLo=; b=A6OxnY6KeTjQVC8nloL9OP1sHpezKWLP4nxVxUySV1+Lizobpmq5yxMz2ypk0grRaP 0fPd5stmjhPZA9tLrm+bpOB+ojxDP6IKVzoI3SgoQNT/n3A3ZUuzdlUt5JEmbl0X6970 BYFAnWe6Hq24FVDGNikZEztEtYnJKR9jmg+G3yqtS+8jm7W86AfNvYjkmRJwZQTgyCp4 WTPSa7+pG3k+KGxUI3+/Be521lzVsSPUnYZdoopJ/ZKe5wogdAW7zFmWYTgihcKuRRQy 6iDkH4aetYOvG8VZcMELSmaXiDHKZrZhB/i6xwHOScINd8APU6KLKP9RRtzaR15T9zfs bLew== X-Gm-Message-State: AN3rC/4tTqEF7e7129jlMK2clMcNGcyEacwhfhDAIHTmxpsPAY3CZKTSOMb70gzeQ+SgBQ== X-Received: by 10.37.173.209 with SMTP id d17mr756669ybe.75.1491599862204; Fri, 07 Apr 2017 14:17:42 -0700 (PDT) Received: from mbmbp.clemson.edu ([130.127.148.92]) by smtp.gmail.com with ESMTPSA id y16sm2519263ywd.23.2017.04.07.14.17.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 14:17:41 -0700 (PDT) From: Martin Brandenburg To: hubcap@omnibond.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Martin Brandenburg Subject: [PATCH 03/10] orangefs: clean up oversize xattr validation Date: Fri, 7 Apr 2017 17:17:05 -0400 Message-Id: <1491599832-17773-4-git-send-email-martin@omnibond.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1491599832-17773-1-git-send-email-martin@omnibond.com> References: <1491599832-17773-1-git-send-email-martin@omnibond.com> 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 Also don't check flags as this has been validated by the VFS already. Fix an off-by-one error in the max size checking. Stop logging just because userspace wants to write attributes which do not fit. This and the previous commit fix xfstests generic/020. Signed-off-by: Martin Brandenburg --- fs/orangefs/xattr.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c index fba4db7..237c9c0 100644 --- a/fs/orangefs/xattr.c +++ b/fs/orangefs/xattr.c @@ -76,11 +76,8 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *name, if (S_ISLNK(inode->i_mode)) return -EOPNOTSUPP; - if (strlen(name) >= ORANGEFS_MAX_XATTR_NAMELEN) { - gossip_err("Invalid key length (%d)\n", - (int)strlen(name)); + if (strlen(name) > ORANGEFS_MAX_XATTR_NAMELEN) return -EINVAL; - } fsuid = from_kuid(&init_user_ns, current_fsuid()); fsgid = from_kgid(&init_user_ns, current_fsgid()); @@ -172,6 +169,9 @@ static int orangefs_inode_removexattr(struct inode *inode, const char *name, struct orangefs_kernel_op_s *new_op = NULL; int ret = -ENOMEM; + if (strlen(name) > ORANGEFS_MAX_XATTR_NAMELEN) + return -EINVAL; + down_write(&orangefs_inode->xattr_sem); new_op = op_alloc(ORANGEFS_VFS_OP_REMOVEXATTR); if (!new_op) @@ -231,23 +231,13 @@ int orangefs_inode_setxattr(struct inode *inode, const char *name, "%s: name %s, buffer_size %zd\n", __func__, name, size); - if (size >= ORANGEFS_MAX_XATTR_VALUELEN || - flags < 0) { - gossip_err("orangefs_inode_setxattr: bogus values of size(%d), flags(%d)\n", - (int)size, - flags); + if (size > ORANGEFS_MAX_XATTR_VALUELEN) + return -EINVAL; + if (strlen(name) > ORANGEFS_MAX_XATTR_NAMELEN) return -EINVAL; - } internal_flag = convert_to_internal_xattr_flags(flags); - if (strlen(name) >= ORANGEFS_MAX_XATTR_NAMELEN) { - gossip_err - ("orangefs_inode_setxattr: bogus key size (%d)\n", - (int)(strlen(name))); - return -EINVAL; - } - /* This is equivalent to a removexattr */ if (size == 0 && value == NULL) { gossip_debug(GOSSIP_XATTR_DEBUG,