From patchwork Fri Mar 10 21:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 67712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1112539wrd; Fri, 10 Mar 2023 13:41:38 -0800 (PST) X-Google-Smtp-Source: AK7set9aSX5GPkbGBdycfzwsIz+fwGOA46P6lPon/y72CuhJjUhHOpVrAJatYy12aBGMAP8JpTAa X-Received: by 2002:a05:6a20:8e28:b0:cc:b3da:822a with SMTP id y40-20020a056a208e2800b000ccb3da822amr28162421pzj.29.1678484497740; Fri, 10 Mar 2023 13:41:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678484497; cv=none; d=google.com; s=arc-20160816; b=unDtR+GZtGdLPevt8iNvCroGOJ4e9ey0yb7udELjnUzVFsxMOXRfk5ZXowe1H719np a/melcvN+zR+XtZv7ambFlKnB27PIYWmJhewDEqSLlOdZTxM6+g2JB6EfMXPx3COsXDr yM5EBnZ6e3ScZ7PUGa5WHgQW0ZvgnH6bBaT6k/2vXS92qNUZiAny6DuZ0uc/oMF6zLcD r0HLnaf4lAEfuODufREgb0+EzoLrAHkgx5R57OxiUv0PnWZ+dXqcas6NnYccTJWtQkYn YcsmE3lOSbOZgop8aLsn02/few6ayUXjY1sdgPCYn36ZJuPjhHiJMoHW5jncDva2FW4d B16w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z9Hw1mGNfrqQHCIlRf3ihFLF3C/I+Z1S5ZBLrVgW4dM=; b=Xgb/ITDiC1Fdv2gIIjGEPHAuHaMztpMhZhWBB3m43m1QsUn0LZKpTrRiPLIoVzwvUl Bj/v5I7S9zlZr8ocNXh00H+zmdabTFxXOipK79El2bUPucAio0PGwKaLXjAK2PxIGocv qKHSX4zPVC+bXVLQyq8A4zQN1Xl858N1NrBNFLUipH/pqDdfzU/HPwq/rMyqKPLhWFww 4vpd43ndVsAT43nWSZDug7+B+PfDij/I439xEWICTYPjdOosGWNWS2NFjAkblskOmGg2 vfkVk9P8nBMB4jy+2NccZdtihbKE+KYip5HSqiuWGMaUtj6EN9Q6C1MvtsU/slcaE6/O D4Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=DMkv1XQN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y14-20020a634b0e000000b004fb95b012a5si683589pga.388.2023.03.10.13.40.48; Fri, 10 Mar 2023 13:41:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=DMkv1XQN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231713AbjCJV2M (ORCPT + 99 others); Fri, 10 Mar 2023 16:28:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231752AbjCJV1w (ORCPT ); Fri, 10 Mar 2023 16:27:52 -0500 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 839D611FFB8; Fri, 10 Mar 2023 13:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=z9Hw1mGNfrqQHCIlRf3ihFLF3C/I+Z1S5ZBLrVgW4dM=; b=DMkv1XQN3eU3rplZDSXZllZDRc x77HaULjFaRGtNKXZkoyQlAN9WAIrgfgafxWVcRX00sQZXkWJ9gLyMY/hfKPGwZyagpnBtv7hR6PY HWLHXTSqsV4bFud9duyV5lex3aBmP8YCtRpR5PGEIMAUVgn8lehz6SQI7TGUJflAHYAfIktioYMjq Qw1SlUPex4dxtIe+fUcfJxUAG//B72Yne2rnrafMp7+yW4a6nGqf8axapFSqmwaoMohj6+5u7ES3n 8nMuKDIX8CKyfoZTy8hI+XVQ2SrXV2IH5FGxIgz5SuAYA5CNyQOXzLfDNObG+HdnMCCJpXgObJ3CC GD13aSsg==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1pakHG-00FR6J-0E; Fri, 10 Mar 2023 21:27:50 +0000 From: Al Viro To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/8] bpf: switch to fdget_raw() Date: Fri, 10 Mar 2023 21:27:46 +0000 Message-Id: <20230310212748.3679076-6-viro@zeniv.linux.org.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310212748.3679076-1-viro@zeniv.linux.org.uk> References: <20230310212536.GX3390869@ZenIV> <20230310212748.3679076-1-viro@zeniv.linux.org.uk> MIME-Version: 1.0 Sender: Al Viro X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760018560857841207?= X-GMAIL-MSGID: =?utf-8?q?1760018560857841207?= Signed-off-by: Al Viro --- kernel/bpf/bpf_inode_storage.c | 38 ++++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/kernel/bpf/bpf_inode_storage.c b/kernel/bpf/bpf_inode_storage.c index 05f4c66c9089..85720311cc67 100644 --- a/kernel/bpf/bpf_inode_storage.c +++ b/kernel/bpf/bpf_inode_storage.c @@ -84,16 +84,13 @@ void bpf_inode_storage_free(struct inode *inode) static void *bpf_fd_inode_storage_lookup_elem(struct bpf_map *map, void *key) { struct bpf_local_storage_data *sdata; - struct file *f; - int fd; + struct fd f = fdget_raw(*(int *)key); - fd = *(int *)key; - f = fget_raw(fd); - if (!f) + if (!f.file) return ERR_PTR(-EBADF); - sdata = inode_storage_lookup(f->f_inode, map, true); - fput(f); + sdata = inode_storage_lookup(file_inode(f.file), map, true); + fdput(f); return sdata ? sdata->data : NULL; } @@ -101,22 +98,19 @@ static int bpf_fd_inode_storage_update_elem(struct bpf_map *map, void *key, void *value, u64 map_flags) { struct bpf_local_storage_data *sdata; - struct file *f; - int fd; + struct fd f = fdget_raw(*(int *)key); - fd = *(int *)key; - f = fget_raw(fd); - if (!f) + if (!f.file) return -EBADF; - if (!inode_storage_ptr(f->f_inode)) { - fput(f); + if (!inode_storage_ptr(file_inode(f.file))) { + fdput(f); return -EBADF; } - sdata = bpf_local_storage_update(f->f_inode, + sdata = bpf_local_storage_update(file_inode(f.file), (struct bpf_local_storage_map *)map, value, map_flags, GFP_ATOMIC); - fput(f); + fdput(f); return PTR_ERR_OR_ZERO(sdata); } @@ -135,16 +129,14 @@ static int inode_storage_delete(struct inode *inode, struct bpf_map *map) static int bpf_fd_inode_storage_delete_elem(struct bpf_map *map, void *key) { - struct file *f; - int fd, err; + struct fd f = fdget_raw(*(int *)key); + int err; - fd = *(int *)key; - f = fget_raw(fd); - if (!f) + if (!f.file) return -EBADF; - err = inode_storage_delete(f->f_inode, map); - fput(f); + err = inode_storage_delete(file_inode(f.file), map); + fdput(f); return err; }