From patchwork Wed Mar 15 04:50:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 739018 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vjfNZ3J2bz9s2Q for ; Wed, 15 Mar 2017 15:52:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JhvNZ4gD"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751358AbdCOEw2 (ORCPT ); Wed, 15 Mar 2017 00:52:28 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34725 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbdCOEw0 (ORCPT ); Wed, 15 Mar 2017 00:52:26 -0400 Received: by mail-pg0-f65.google.com with SMTP id b5so897478pgg.1 for ; Tue, 14 Mar 2017 21:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=dZkGEOqw27I/oC3E0Q+IW8UO9R3+tRbm74pwh+H91VI=; b=JhvNZ4gDl55uQoYhIU8/HBekZN/7tMKF+RS5mjP9oM1ZBPtdGF8G3d5nZ4qFJoKWUH W1QVeZq97e5XJG3rBoPKWWmzrdrWLZdejN7UQam2lG5DmVk0h0hIsH9oVgoEsd5Xk2vM OpBQ88Wplw7nW27IzukUYZVqlGp8xmOG3jFy0WZvCz+bbQgGCYwPT17yof6cE4cXJk5p amcTMlKFzNYmgOrC4Ind7N5hxihrjgrNkqrfopoT09nQQs8dpDqSQCQ/4cvbcJtzI75R fD0Ih0TV5fkKGD77yP5sfo+st6YuKg5HpQDt7YV4JUL2Vn37Q7P+M7lfRUV7AV+11w8a N8Cw== 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=dZkGEOqw27I/oC3E0Q+IW8UO9R3+tRbm74pwh+H91VI=; b=GCxHfXKoilB/OhLqhTANzAQpHFKxXolrU1E/P8p9OWyLlcTuwCRkqcaOEWkVV7jaaB b3wYHKhaMXFkua24uxDWFWJcSiL42r3zytyaWxO0EojyWfg2dCTlc3SyvrmVL6xQGQ3y lpK+jzz00Oc29TgHsDA/Vui393eh5W4ynjLTsuIJ7Q0WajQRp2y3PQR8E0BV1QFikuqH MsgjCsmkSn1VwWA11+FsDrXnSHJ2O9WlY5deaVmfTx8dzT1G4SdzhezrC3yEOb2hczsi faozqcCrmBiSd27nqUkstJ4WJNHxBU+yjTAt2TCqsJhzAHlqiPbdEyliO6YRoZ09IfWO Vr5w== X-Gm-Message-State: AFeK/H24icrcghtDTrKrNw3yEs3oaTdd+L5d5axaJfKSV2f4BK6m9H0+k30d0kIplcG5aA== X-Received: by 10.98.163.141 with SMTP id q13mr1556665pfl.72.1489553544745; Tue, 14 Mar 2017 21:52:24 -0700 (PDT) Received: from zzz.hsd1.wa.comcast.net (c-73-239-167-150.hsd1.wa.comcast.net. [73.239.167.150]) by smtp.gmail.com with ESMTPSA id o5sm981290pgj.66.2017.03.14.21.52.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Mar 2017 21:52:24 -0700 (PDT) From: Eric Biggers To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , Andreas Dilger , Eric Biggers Subject: [PATCH 1/2] ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries() Date: Tue, 14 Mar 2017 21:50:55 -0700 Message-Id: <20170315045057.18837-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers ext4_xattr_check_names() actually validates both the xattr names and values, not just the names. So rename it to ext4_xattr_check_entries() to avoid confusion. Signed-off-by: Eric Biggers Reviewed-by: Jan Kara --- fs/ext4/xattr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 1d59895a91ee..71bf40933bbb 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -167,8 +167,8 @@ ext4_xattr_handler(int name_index) } static int -ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end, - void *value_start) +ext4_xattr_check_entries(struct ext4_xattr_entry *entry, void *end, + void *value_start) { struct ext4_xattr_entry *e = entry; @@ -222,8 +222,8 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh) return -EFSCORRUPTED; if (!ext4_xattr_block_csum_verify(inode, bh->b_blocknr, BHDR(bh))) return -EFSBADCRC; - error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size, - bh->b_data); + error = ext4_xattr_check_entries(BFIRST(bh), bh->b_data + bh->b_size, + bh->b_data); if (!error) set_buffer_verified(bh); return error; @@ -238,7 +238,7 @@ __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header, if (end - (void *)header < sizeof(*header) + sizeof(u32) || (header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC))) goto errout; - error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header)); + error = ext4_xattr_check_entries(IFIRST(header), end, IFIRST(header)); errout: if (error) __ext4_error_inode(inode, function, line, 0,