net/sched: taprio: Check if socket flags are valid
[ Upstream commite8a64bbaaa
] A user may set the SO_TXTIME socket option to ensure a packet is send at a given time. The taprio scheduler has to confirm, that it is allowed to send a packet at that given time, by a check against the packet time schedule. The scheduler drop the packet, if the gates are closed at the given send time. The check, if SO_TXTIME is set, may fail since sk_flags are part of an union and the union is used otherwise. This happen, if a socket is not a full socket, like a request socket for example. Add a check to verify, if the union is used for sk_flags. Fixes:4cfd5779bd
("taprio: Add support for txtime-assist mode") Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de> Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de> Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
62a48383eb
Коммит
d5be67ecbe
|
@ -417,7 +417,8 @@ static int taprio_enqueue_one(struct sk_buff *skb, struct Qdisc *sch,
|
||||||
{
|
{
|
||||||
struct taprio_sched *q = qdisc_priv(sch);
|
struct taprio_sched *q = qdisc_priv(sch);
|
||||||
|
|
||||||
if (skb->sk && sock_flag(skb->sk, SOCK_TXTIME)) {
|
/* sk_flags are only safe to use on full sockets. */
|
||||||
|
if (skb->sk && sk_fullsock(skb->sk) && sock_flag(skb->sk, SOCK_TXTIME)) {
|
||||||
if (!is_valid_interval(skb, sch))
|
if (!is_valid_interval(skb, sch))
|
||||||
return qdisc_drop(skb, sch, to_free);
|
return qdisc_drop(skb, sch, to_free);
|
||||||
} else if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
|
} else if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче