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

!11672 netem: fix return value if duplicate enqueue fails 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SXPRHOQ7HED5Q4OYNFLBRBFFEQJQIK7I/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAQOJ5 
 
Link:https://gitee.com/openeuler/kernel/pulls/11672

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 0e2447ed 57fb52c2

net/sched/sch_netem.c

+29 −18
Original line number Diff line number Diff line
@@ -446,12 +446,10 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
	struct netem_sched_data *q = qdisc_priv(sch);

	/* We don't fill cb now as skb_unshare() may invalidate it */

	struct netem_skb_cb *cb;

	struct sk_buff *skb2;

	struct sk_buff *skb2 = NULL;

	struct sk_buff *segs = NULL;

	unsigned int prev_len = qdisc_pkt_len(skb);

	int count = 1;

	int rc = NET_XMIT_SUCCESS;

	int rc_drop = NET_XMIT_DROP;



	/* Do not fool qdisc_drop_all() */

	skb->prev = NULL;
@@ -480,19 +478,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
		skb_orphan_partial(skb);



	/*

	 * If we need to duplicate packet, then re-insert at top of the

	 * qdisc tree, since parent queuer expects that only one

	 * skb will be queued.

	 * If we need to duplicate packet, then clone it before

	 * original is modified.

	 */

	if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) {

		struct Qdisc *rootq = qdisc_root_bh(sch);

		u32 dupsave = q->duplicate; /* prevent duplicating a dup... */



		q->duplicate = 0;

		rootq->enqueue(skb2, rootq, to_free);

		q->duplicate = dupsave;

		rc_drop = NET_XMIT_SUCCESS;

	}

	if (count > 1)

		skb2 = skb_clone(skb, GFP_ATOMIC);



	/*

	 * Randomized packet corruption.
@@ -504,7 +494,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
		if (skb_is_gso(skb)) {

			skb = netem_segment(skb, sch, to_free);

			if (!skb)

				return rc_drop;

				goto finish_segs;



			segs = skb->next;

			skb_mark_not_on_list(skb);

			qdisc_skb_cb(skb)->pkt_len = skb->len;
@@ -530,7 +521,24 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
		/* re-link segs, so that qdisc_drop_all() frees them all */

		skb->next = segs;

		qdisc_drop_all(skb, sch, to_free);

		return rc_drop;

		if (skb2)

			__qdisc_drop(skb2, to_free);

		return NET_XMIT_DROP;

	}



	/*

	 * If doing duplication then re-insert at top of the

	 * qdisc tree, since parent queuer expects that only one

	 * skb will be queued.

	 */

	if (skb2) {

		struct Qdisc *rootq = qdisc_root_bh(sch);

		u32 dupsave = q->duplicate; /* prevent duplicating a dup... */



		q->duplicate = 0;

		rootq->enqueue(skb2, rootq, to_free);

		q->duplicate = dupsave;

		skb2 = NULL;

	}



	qdisc_qstats_backlog_inc(sch, skb);
@@ -601,9 +609,12 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 
	}



finish_segs:

	if (skb2)

		__qdisc_drop(skb2, to_free);



	if (segs) {

		unsigned int len, last_len;

		int nb;

		int rc, nb;



		len = skb ? skb->len : 0;

		nb = skb ? 1 : 0;