Unverified Commit 654ad5c7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6849 erofs: fix pcluster use-after-free on UP platforms 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NBQQRGLQFLCFQNRWDCGDDNYELHT3347U/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9LK3Y 
 
Link:https://gitee.com/openeuler/kernel/pulls/6849

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7c14082d 941f3154

fs/erofs/internal.h

+0 −29
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ struct erofs_workgroup { 
	atomic_t refcount;

};



#if defined(CONFIG_SMP)

static inline bool erofs_workgroup_try_to_freeze(struct erofs_workgroup *grp,

						 int val)

{
@@ -154,34 +153,6 @@ static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp) 
	return atomic_cond_read_relaxed(&grp->refcount,

					VAL != EROFS_LOCKED_MAGIC);

}

#else

static inline bool erofs_workgroup_try_to_freeze(struct erofs_workgroup *grp,

						 int val)

{

	preempt_disable();

	/* no need to spin on UP platforms, let's just disable preemption. */

	if (val != atomic_read(&grp->refcount)) {

		preempt_enable();

		return false;

	}

	return true;

}



static inline void erofs_workgroup_unfreeze(struct erofs_workgroup *grp,

					    int orig_val)

{

	preempt_enable();

}



static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp)

{

	int v = atomic_read(&grp->refcount);



	/* workgroup is never freezed on uniprocessor systems */

	DBG_BUGON(v == EROFS_LOCKED_MAGIC);

	return v;

}

#endif	/* !CONFIG_SMP */



/* hard limit of pages per compressed cluster */

#define Z_EROFS_CLUSTER_MAX_PAGES       (CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT)