From 20b56835b82c5d21c51ab981e441c7607a5eaae5 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Thu, 6 Oct 2022 07:40:41 -0400 Subject: [PATCH] LU-15014 osc: Fix possible null pointer Change init to fix possible null pointer access. Signed-off-by: Patrick Farrell Change-Id: Id1bee8b5ea5fb92a8831992ad44c487c69d52e1e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/44975 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/osc/osc_cache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c index 8240ae6..663e749 100644 --- a/lustre/osc/osc_cache.c +++ b/lustre/osc/osc_cache.c @@ -2233,15 +2233,13 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, struct cl_page *page, loff_t offset) { struct osc_async_page *oap = &ops->ops_oap; - struct page *vmpage = page->cp_vmpage; - ENTRY; + ENTRY; if (!page) return cfs_size_round(sizeof(*oap)); oap->oap_obj = osc; - - oap->oap_page = vmpage; + oap->oap_page = page->cp_vmpage; oap->oap_obj_off = offset; LASSERT(!(offset & ~PAGE_MASK)); @@ -2257,7 +2255,7 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops, INIT_LIST_HEAD(&oap->oap_rpc_item); CDEBUG(D_INFO, "oap %p vmpage %p obj off %llu\n", - oap, vmpage, oap->oap_obj_off); + oap, oap->oap_page, oap->oap_obj_off); RETURN(0); } EXPORT_SYMBOL(osc_prep_async_page); -- 1.8.3.1