From patchwork Mon Jun 10 20:09:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 91836 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B45FD385B532 for ; Mon, 10 Jun 2024 20:11:28 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id B26BB385DDC2 for ; Mon, 10 Jun 2024 20:09:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B26BB385DDC2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B26BB385DDC2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718050175; cv=none; b=ewfHLKmSRV7eWqNR7NfRKwK2iroIjaR8aaNqM4DvolgnOFfoE1M2ByNehfh7zLjmGy95vFzFzpqizxd0VWoqddH7dOmSnuVKKTJsh99pwow772OkVvgLqq3/0YL04L04K28yWW0QyadmKV1fSwCJIb9mTWM78kgGy1pOKBTkh1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718050175; c=relaxed/simple; bh=zfVp1VFO22EcBF/4qZ9U4HYhXkI4Uu/tNWVsohAhGGk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ZWdsyC/nOVgcGhUERKaxcOTeYfL6C8GxT7mbYCV+SEecWXqEDeS6HJ7y/x+m/fuMmQ8/vSSBIAxZnSWoMlXQJWa9gbJKsFcyL05Eqz17dHfwGAeM2JFxtEHNrcbB01rWeun9sz2NRQj06QOPThGiYdEQE5mA1ZDTCO64qZMDnqM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id D9A9CA0317; Mon, 10 Jun 2024 22:09:31 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8CqYSL5eEjOy; Mon, 10 Jun 2024 22:09:31 +0200 (CEST) Received: from begin (aamiens-653-1-111-57.w83-192.abo.wanadoo.fr [83.192.234.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 94328A032A; Mon, 10 Jun 2024 22:09:31 +0200 (CEST) Received: from samy by begin with local (Exim 4.97) (envelope-from ) id 1sGlKd-00000002aKs-0a3m; Mon, 10 Jun 2024 22:09:31 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited 3/4] hurd: Fix setxattr return value on replacing Date: Mon, 10 Jun 2024 22:09:29 +0200 Message-ID: <20240610200930.616306-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240610200930.616306-1-samuel.thibault@ens-lyon.org> References: <20240610200930.616306-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org When XATTR_REPLACE is set we shall succeed when the value already exists, and fail with ENODATA otherwise, instead of the converse. --- hurd/xattr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hurd/xattr.c b/hurd/xattr.c index f613d47c83..1a84c90db8 100644 --- a/hurd/xattr.c +++ b/hurd/xattr.c @@ -158,10 +158,9 @@ _hurd_xattr_set (io_t port, const char *name, const void *value, size_t size, if (err) return err; if (bufsz > 0) - { - __munmap (buf, bufsz); - return ENODATA; - } + __munmap (buf, bufsz); + else + return ENODATA; } return __file_set_translator (port, FS_TRANS_SET | ((flags & XATTR_CREATE)