Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp6355730yba; Wed, 1 May 2019 10:35:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqyWS17z87EDPqYAUoT2ebVAHsfmVvXNOQsBRvFd+aH7uZoxGesXPG0XDAcgnfmPGio23S8A X-Received: by 2002:a65:63d5:: with SMTP id n21mr75300335pgv.330.1556732126268; Wed, 01 May 2019 10:35:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556732126; cv=none; d=google.com; s=arc-20160816; b=PAVLBmWiEeYPfRUZCrxet+/hyoaAzmU8yyNgrZEBfq8qeGbArtAh44Va/bdUpth/PG 2/ygGkjDLX4KDQYYA4fN32gvi9kfiMmw9o3yBkutAz3/O3uJ4K13v6UGQfrGTDsHcycq vR7frJDl5EPRDtLQCikHWXEyCCLOD+D2SyZ/a+JO5cJyM9e0oIX/wpTJ6r9V0kUcYoG+ 7iBbgQ+7gGIkVJDEWgLO98KxfLoioLQ6vL+pDURChibvuqjfdsVZGQLAnxjDOWqkqX7w 9AV4l/MulxKUATyfTcKHGvc1xf85Mfrj8BROnpAVbMDVJU2AJ9ONEwj9ibwdwqBzeT35 C4vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=FYD0+O1saS54RtwokFj4HpWLfzD9N+ZLICLPr9lVc/c=; b=OQ+ZIhpJByvRZfMZEadF6S60mK5hHVOu5GSJzxJKMcGUyfWhbYFSWsOTNhh3Oyn2DR 03uX12cE1hgYU6XpX0aUDvc+RLjq6nwm5+W2xh4kU3a0qUk2KC7LDjTdyNTfPj6E9Lt/ /zBEaEOn6xxsbCN794F9g+m6gFfPRDwTlq8iiCiFGyMxw4YqO0XP801lVVuVKcB4BcTH U/quaVXfiMdqFSn1bOaoRf36pq+gw3sfOunxAlTCbtF/B9UtPJhBE2aqLHpRUWcZwlpY SLr5RU2fdSBrrSWGD8cQL0ZyF9G2bQZRUUw3zea5NKFFfw+LR2lglEUY7SdPw5ANvaCZ 7oqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m186si29977744pfb.96.2019.05.01.10.35.06; Wed, 01 May 2019 10:35:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726069AbfEARfB (ORCPT + 99 others); Wed, 1 May 2019 13:35:01 -0400 Received: from verein.lst.de ([213.95.11.211]:54116 "EHLO newverein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726019AbfEARfB (ORCPT ); Wed, 1 May 2019 13:35:01 -0400 Received: by newverein.lst.de (Postfix, from userid 2407) id 5364068AFE; Wed, 1 May 2019 19:34:43 +0200 (CEST) Date: Wed, 1 May 2019 19:34:43 +0200 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/4] 9p: pass the correct prototype to read_cache_page Message-ID: <20190501173443.GA19969@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190501160636.30841-1-hch@lst.de> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Fix the callback 9p passes to read_cache_page to actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection. Signed-off-by: Christoph Hellwig --- fs/9p/vfs_addr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 0bcbcc20f769..02e0fc51401e 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -50,8 +50,9 @@ * @page: structure to page * */ -static int v9fs_fid_readpage(struct p9_fid *fid, struct page *page) +static int v9fs_fid_readpage(void *data, struct page *page) { + struct p9_fid *fid = data; struct inode *inode = page->mapping->host; struct bio_vec bvec = {.bv_page = page, .bv_len = PAGE_SIZE}; struct iov_iter to; @@ -122,7 +123,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping, if (ret == 0) return ret; - ret = read_cache_pages(mapping, pages, (void *)v9fs_vfs_readpage, filp); + ret = read_cache_pages(mapping, pages, v9fs_fid_readpage, + filp->private_data); p9_debug(P9_DEBUG_VFS, " = %d\n", ret); return ret; } -- 2.20.1