From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by sourceware.org (Postfix) with ESMTPS id 664263AA9828 for ; Sat, 17 Dec 2022 16:53:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 664263AA9828 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x629.google.com with SMTP id d15so5199732pls.6 for ; Sat, 17 Dec 2022 08:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kdvUToojEJX7qPBoy/cOVqvj/5wfErbx540v6xtDHyA=; b=m4lgL8E0uwLF+e61y8yoD6Z+r5N19GiWnRZvYRq+1NKqNaKhh3b2TDNZZl/HK5HupX XGcRRkTdb4BX3rRIMn4I/XTY6K9CY0VIe2/Ut3kbL7SiqKQO2HgExfZTmxDSaDAJkLZG 0YGaP+/CA59cB9JuoGQCQbEV1ARdzLtbtdRt7/d0x1sWdvpg/5UJJzXbiJSrHSJTOWXj /fOmlnERta7uMyuHSCWFxydwgCwTxuYRIiUuJBIneqfuX+LnAs9FIw/zgwmpNTrSUWrh tf1Ig/nKrRJ8QfpA0eobFcoToBkPfQHR9DQT8+0qlniHbksVU8oqAqAnzEZdI+cLS13k Q7xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kdvUToojEJX7qPBoy/cOVqvj/5wfErbx540v6xtDHyA=; b=HkE0LtLhEXOZ04Zhw9RHe1KeBoaPRNZBlVFgmFUUpe4QFCCng2JIEf1T0HGnd8jrSC DPQHOED24TIbeX4AInx58dRuG5rq1rPmHiMmcUS91l4wE5wQ8/ryBYHQ+bF3Y9hWx0NX Q2/FrPn/JJvxUs3yb0rmqlTSKkMi8VjQ55NIto2JyQQjIxEadew9Celsrx4fE3fdCLz1 PcC/CqELmgKc2rDs69iEEEH+9PamkdkCtv/4qLrm2prPK1jKXvta3k/IIEy0PmrH586z s8hnCxDonNoLiFNkFzCOcKCjARtPUsw9mbK/Y7NrZ3BcfOh9KierKuxOKqAA6rysyAQ7 xMqQ== X-Gm-Message-State: ANoB5pnhm5H1KrgvZuTG8uzxcEM1jSMCjH5zSKYllv/yX5oKienPwhll cjrPFhFQV+t/NIqEH0OGP+2abUpEmNw= X-Google-Smtp-Source: AA0mqf47IGEPdC+P2r2dogYJ9l4PrbBDMJPX53BcdQBk6V+FXWtqjMnAeQaf8UVFTLSSyWEU11Ocxw== X-Received: by 2002:a17:90a:eb88:b0:219:986d:696f with SMTP id o8-20020a17090aeb8800b00219986d696fmr37668364pjy.22.1671295981155; Sat, 17 Dec 2022 08:53:01 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s92-20020a17090a2f6500b002191873187dsm6643229pjd.33.2022.12.17.08.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 08:53:00 -0800 (PST) From: Yonggang Luo To: elfutils-devel@sourceware.org Cc: Yonggang Luo Subject: [PATCH v2 15/16] libelf: F_GETFD may not predefined with msvc/mingw, guard the usage of it Date: Sun, 18 Dec 2022 00:52:12 +0800 Message-Id: <20221217165213.152-16-luoyonggang@gmail.com> X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: <20221217165213.152-1-luoyonggang@gmail.com> References: <20221217165213.152-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Signed-off-by: Yonggang Luo --- libelf/elf_begin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c index 6d31882e..3d324694 100644 --- a/libelf/elf_begin.c +++ b/libelf/elf_begin.c @@ -1163,12 +1163,19 @@ elf_begin (int fildes, Elf_Cmd cmd, Elf *ref) if (ref != NULL) /* Make sure the descriptor is not suddenly going away. */ rwlock_rdlock (ref->lock); +#if defined(F_GETFD) else if (unlikely (fcntl (fildes, F_GETFD) == -1 && errno == EBADF)) { /* We cannot do anything productive without a file descriptor. */ __libelf_seterrno (ELF_E_INVALID_FILE); return NULL; } +#else + else if (fildes < 0) + { + return NULL; + } +#endif switch (cmd) { -- 2.36.1.windows.1