mirror of
https://github.com/torvalds/linux.git
synced 2026-10-24 16:55:02 +02:00
skbedit can set skb->queue_mapping and raise the per-CPU skip_txqueue flag so __dev_queue_xmit() honours the mapping. __dev_queue_xmit() cleared the flag before sch_handle_egress() and only read it afterwards, so the flag was not confined to the xmit that set it: a nested xmit (mirred redirect or mirror, or a drop after skbedit) could set the flag and the outer xmit would consume it for an skb that never went through skbedit. A forwarded packet still carries the ingress NIC's rx_queue + 1 in skb->queue_mapping, so the outer device then indexes its tx queue state with that stale value. Taprio's child array q->qdiscs[] is sized to the device's queue count, so taprio_enqueue() indexes past its allocation and dereferences the result as a struct Qdisc *. We (ab)use the skb->nf_skip_egress which means "skip netfilter egress for this packet" to tag to "am I in tc egress?". Despite the overload I dont see it as a conflict since the marker is set only around the single sch_handle_egress() call and ingress path is guarded by tc_at_ingress. I will send a followup(net-next) patch once this hits net-next to rename the skb->nf_skip_egress bit/flag to skb->skip_egress Arm the flag only from the egress classifier that can use it: raise skip_txqueue from tcf_skbedit_act() only when it runs inside sch_handle_egress(), thanks to skb->nf_skip_egress. An egress qdisc classifier runs in q->enqueue(), after the tx queue has been picked, so a mapping it sets cannot affect the current packet; arming the flag there only pollutes it for a later xmit. Then own the flag for the xmit frame the egress hook runs in: save the incoming value and clear it just before sch_handle_egress(), and restore it after the hook - on the consumed (drop) path, or, in the same call that reads it, on the surviving path. The save and the restores stay inside the egress_needed_key static branch, so a packet pays for them only when egress hooks are active (2f1e85b1ae). Store the value netdev_cap_txqueue() selected back into skb->queue_mapping in netdev_tx_queue_mapping(), as netdev_core_pick_tx() already does, so the skip_txqueue path never hands a later reader on the xmit path a mapping the device cannot serve. A store made still later in the same frame, by a tc BPF program attached to a transmit qdisc, is outside this path and is not re-capped; a separate followup will resolve that path. netdev_xmit_skip_txqueue() returns the previous flag value so the save-and-clear is one call, and a no-op stub is provided when CONFIG_NET_EGRESS is disabled. skb->nf_skip_egress is compiled under CONFIG_NET_EGRESS rather than CONFIG_NETFILTER_SKIP_EGRESS, so skb_at_tc_egress() is valid whenever the egress path is built. A local user in a network namespace can redirect a packet from a device with more TX queues to one with fewer after setting a mapping valid only on the larger device. That reaches these reads and, under KASAN, faults with "slab-out-of-bounds in taprio_enqueue". Conditions to recreate the bug: the report's own trigger is a local user with CAP_NET_ADMIN in a network namespace, so no eBPF program is needed. With CONFIG_NET_SCH_TAPRIO=y, CONFIG_NET_ACT_SKBEDIT=y, CONFIG_NET_ACT_MIRRED=y, CONFIG_NET_CLS_MATCHALL=y, CONFIG_NET_SCH_PRIO=y and KASAN enabled, create qa (3 queues), qb (2 queues) and qc (1 queue) as dummy devices; put a taprio root on qb (num_tc 1, queues 2@0) and clsact on all three; then add an egress matchall filter on every device. On qa: "action skbedit queue_mapping 2 pipe action mirred egress redirect dev qb". On qb: "action mirred egress mirror dev qc". On qc: "action skbedit queue_mapping 0 pipe". Send one packet out qa. qc's skbedit sets the flag while qb's outer xmit is in flight; without the fix qb consumes it and reads its two-entry taprio child array with the forwarded packet's stale mapping. A qc whose skbedit is instead installed in a transmit-qdisc classifier (a matchall filter on the qc root qdisc) reaches the same code path the same way without the fix. Testing: on a KASAN build with panic_on_warn=1 the unfixed kernel panics with "BUG: KASAN: slab-out-of-bounds in taprio_enqueue", a read 0 bytes past a 16-byte taprio_init() allocation, for the clsact-setter and the transmit-qdisc-classifier reproducers and for a clsact skbedit-then-tc-BPF store; the fixed kernel runs all three with no report, and the BPF store variant additionally shows the expected "selects TX queue" clamp notice from the write-back. Fixes:2f1e85b1ae("net: sched: use queue_mapping to pick tx queue") Reported-by: Zero Day Initiative <zdi-disclosures@trendmicro.com> Link: https://lore.kernel.org/netdev/CANn89iLwYx8nCVf0pCEk_MmEiyC6kQaMwCQT9WkQVeeNzNQHqQ@mail.gmail.com/ Link: https://lore.kernel.org/netdev/179008581937.2160803.7117814290574262942@kernel.org/ Link: https://lore.kernel.org/netdev/179033713973.2160803.4914570693994398206@kernel.org/ Link: https://lore.kernel.org/netdev/20260925180407.63647514@kernel.org/ Link: https://lore.kernel.org/netdev/CANn89i+k-mZKDQVtvws_MEXeuMTAdaCcOXFZE-RfhcGTu90sjA@mail.gmail.com/ Suggested-by: Eric Dumazet <edumazet@google.com> Suggested-by: Jakub Kicinski <kuba@kernel.org> Tested-by: hybris <hybris@mojatatu.ai> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/QDISC-9R8V.v4.20260928081529@mojatatu.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
259 lines
7.7 KiB
C
259 lines
7.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __LINUX_RTNETLINK_H
|
|
#define __LINUX_RTNETLINK_H
|
|
|
|
|
|
#include <linux/mutex.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/wait.h>
|
|
#include <linux/refcount.h>
|
|
#include <uapi/linux/rtnetlink.h>
|
|
|
|
extern int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, u32 group, int echo);
|
|
|
|
static inline int rtnetlink_maybe_send(struct sk_buff *skb, struct net *net,
|
|
u32 pid, u32 group, int echo)
|
|
{
|
|
return !skb ? 0 : rtnetlink_send(skb, net, pid, group, echo);
|
|
}
|
|
|
|
extern int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid);
|
|
extern void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid,
|
|
u32 group, const struct nlmsghdr *nlh, gfp_t flags);
|
|
extern void rtnl_set_sk_err(struct net *net, u32 group, int error);
|
|
extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
|
|
extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
|
|
u32 id, long expires, u32 error);
|
|
|
|
void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change, gfp_t flags,
|
|
u32 portid, const struct nlmsghdr *nlh);
|
|
void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,
|
|
gfp_t flags, int *new_nsid, int new_ifindex);
|
|
struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
|
|
unsigned change, u32 event,
|
|
gfp_t flags, int *new_nsid,
|
|
int new_ifindex, u32 portid,
|
|
const struct nlmsghdr *nlh);
|
|
void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev,
|
|
gfp_t flags, u32 portid, const struct nlmsghdr *nlh);
|
|
|
|
|
|
/* RTNL is used as a global lock for all changes to network configuration */
|
|
extern void rtnl_lock(void);
|
|
extern void rtnl_unlock(void);
|
|
extern int rtnl_trylock(void);
|
|
extern int rtnl_is_locked(void);
|
|
extern int rtnl_lock_interruptible(void);
|
|
extern int rtnl_lock_killable(void);
|
|
extern bool refcount_dec_and_rtnl_lock(refcount_t *r);
|
|
|
|
extern wait_queue_head_t netdev_unregistering_wq;
|
|
extern atomic_t dev_unreg_count;
|
|
extern struct rw_semaphore pernet_ops_rwsem;
|
|
extern struct rw_semaphore net_rwsem;
|
|
|
|
#define ASSERT_RTNL() \
|
|
WARN_ONCE(!rtnl_is_locked(), \
|
|
"RTNL: assertion failed at %s (%d)\n", __FILE__, __LINE__)
|
|
|
|
#ifdef CONFIG_PROVE_LOCKING
|
|
extern bool lockdep_rtnl_is_held(void);
|
|
#else
|
|
static inline bool lockdep_rtnl_is_held(void)
|
|
{
|
|
return true;
|
|
}
|
|
#endif /* #ifdef CONFIG_PROVE_LOCKING */
|
|
|
|
/**
|
|
* rcu_dereference_rtnl - rcu_dereference with debug checking
|
|
* @p: The pointer to read, prior to dereferencing
|
|
*
|
|
* Do an rcu_dereference(p), but check caller either holds rcu_read_lock()
|
|
* or RTNL. Note : Please prefer rtnl_dereference() or rcu_dereference()
|
|
*/
|
|
#define rcu_dereference_rtnl(p) \
|
|
rcu_dereference_check(p, lockdep_rtnl_is_held())
|
|
|
|
/**
|
|
* rtnl_dereference - fetch RCU pointer when updates are prevented by RTNL
|
|
* @p: The pointer to read, prior to dereferencing
|
|
*
|
|
* Return: the value of the specified RCU-protected pointer, but omit
|
|
* the READ_ONCE(), because caller holds RTNL.
|
|
*/
|
|
#define rtnl_dereference(p) \
|
|
rcu_dereference_protected(p, lockdep_rtnl_is_held())
|
|
|
|
/**
|
|
* rcu_replace_pointer_rtnl - replace an RCU pointer under rtnl_lock, returning
|
|
* its old value
|
|
* @rp: RCU pointer, whose value is returned
|
|
* @p: regular pointer
|
|
*
|
|
* Perform a replacement under rtnl_lock, where @rp is an RCU-annotated
|
|
* pointer. The old value of @rp is returned, and @rp is set to @p
|
|
*/
|
|
#define rcu_replace_pointer_rtnl(rp, p) \
|
|
rcu_replace_pointer(rp, p, lockdep_rtnl_is_held())
|
|
|
|
#ifdef CONFIG_DEBUG_NET_SMALL_RTNL
|
|
void __rtnl_net_lock(struct net *net);
|
|
void __rtnl_net_unlock(struct net *net);
|
|
void rtnl_net_lock(struct net *net);
|
|
void rtnl_net_unlock(struct net *net);
|
|
int rtnl_net_trylock(struct net *net);
|
|
int rtnl_net_lock_killable(struct net *net);
|
|
int rtnl_net_lock_cmp_fn(const struct lockdep_map *a, const struct lockdep_map *b);
|
|
|
|
bool rtnl_net_is_locked(struct net *net);
|
|
|
|
#define ASSERT_RTNL_NET(net) \
|
|
WARN_ONCE(!rtnl_net_is_locked(net), \
|
|
"RTNL_NET: assertion failed at %s (%d)\n", \
|
|
__FILE__, __LINE__)
|
|
|
|
bool lockdep_rtnl_net_is_held(struct net *net);
|
|
|
|
void rtnl_net_queue_work(struct net *net);
|
|
void rtnl_net_flush_workqueue(void);
|
|
void rtnl_net_work_func(struct work_struct *work);
|
|
|
|
#define rcu_dereference_rtnl_net(net, p) \
|
|
rcu_dereference_check(p, lockdep_rtnl_net_is_held(net))
|
|
#define rtnl_net_dereference(net, p) \
|
|
rcu_dereference_protected(p, lockdep_rtnl_net_is_held(net))
|
|
#define rcu_replace_pointer_rtnl_net(net, rp, p) \
|
|
rcu_replace_pointer(rp, p, lockdep_rtnl_net_is_held(net))
|
|
#else
|
|
static inline void __rtnl_net_lock(struct net *net) {}
|
|
static inline void __rtnl_net_unlock(struct net *net) {}
|
|
|
|
static inline void rtnl_net_lock(struct net *net)
|
|
{
|
|
rtnl_lock();
|
|
}
|
|
|
|
static inline void rtnl_net_unlock(struct net *net)
|
|
{
|
|
rtnl_unlock();
|
|
}
|
|
|
|
static inline int rtnl_net_trylock(struct net *net)
|
|
{
|
|
return rtnl_trylock();
|
|
}
|
|
|
|
static inline int rtnl_net_lock_killable(struct net *net)
|
|
{
|
|
return rtnl_lock_killable();
|
|
}
|
|
|
|
static inline void ASSERT_RTNL_NET(struct net *net)
|
|
{
|
|
ASSERT_RTNL();
|
|
}
|
|
|
|
static inline void rtnl_net_flush_workqueue(void)
|
|
{
|
|
}
|
|
|
|
#define rcu_dereference_rtnl_net(net, p) \
|
|
rcu_dereference_rtnl(p)
|
|
#define rtnl_net_dereference(net, p) \
|
|
rtnl_dereference(p)
|
|
#define rcu_replace_pointer_rtnl_net(net, rp, p) \
|
|
rcu_replace_pointer_rtnl(rp, p)
|
|
#endif
|
|
|
|
static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)
|
|
{
|
|
return rtnl_dereference(dev->ingress_queue);
|
|
}
|
|
|
|
static inline struct netdev_queue *dev_ingress_queue_rcu(struct net_device *dev)
|
|
{
|
|
return rcu_dereference(dev->ingress_queue);
|
|
}
|
|
|
|
struct netdev_queue *dev_ingress_queue_create(struct net_device *dev);
|
|
|
|
#ifdef CONFIG_NET_INGRESS
|
|
void net_inc_ingress_queue(void);
|
|
void net_dec_ingress_queue(void);
|
|
#endif
|
|
|
|
#ifdef CONFIG_NET_EGRESS
|
|
void net_inc_egress_queue(void);
|
|
void net_dec_egress_queue(void);
|
|
bool netdev_xmit_skip_txqueue(bool skip);
|
|
#else
|
|
static inline bool netdev_xmit_skip_txqueue(bool skip)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
void rtnetlink_init(void);
|
|
void __rtnl_unlock(void);
|
|
void rtnl_kfree_skbs(struct sk_buff *head, struct sk_buff *tail);
|
|
|
|
/* Shared by rtnl_fdb_dump() and various ndo_fdb_dump() helpers. */
|
|
struct ndo_fdb_dump_context {
|
|
unsigned long ifindex;
|
|
unsigned long fdb_idx;
|
|
};
|
|
|
|
extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
|
|
struct netlink_callback *cb,
|
|
struct net_device *dev,
|
|
struct net_device *filter_dev,
|
|
int *idx);
|
|
extern int ndo_dflt_fdb_add(struct ndmsg *ndm,
|
|
struct nlattr *tb[],
|
|
struct net_device *dev,
|
|
const unsigned char *addr,
|
|
u16 vid,
|
|
u16 flags);
|
|
extern int ndo_dflt_fdb_del(struct ndmsg *ndm,
|
|
struct nlattr *tb[],
|
|
struct net_device *dev,
|
|
const unsigned char *addr,
|
|
u16 vid);
|
|
|
|
extern int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
|
|
struct net_device *dev, u16 mode,
|
|
u32 flags, u32 mask, int nlflags,
|
|
u32 filter_mask,
|
|
int (*vlan_fill)(struct sk_buff *skb,
|
|
struct net_device *dev,
|
|
u32 filter_mask));
|
|
|
|
extern void rtnl_offload_xstats_notify(struct net_device *dev);
|
|
|
|
static inline int rtnl_has_listeners(const struct net *net, u32 group)
|
|
{
|
|
struct sock *rtnl = net->rtnl;
|
|
|
|
return netlink_has_listeners(rtnl, group);
|
|
}
|
|
|
|
/**
|
|
* rtnl_notify_needed - check if notification is needed
|
|
* @net: Pointer to the net namespace
|
|
* @nlflags: netlink ingress message flags
|
|
* @group: rtnl group
|
|
*
|
|
* Based on the ingress message flags and rtnl group, returns true
|
|
* if a notification is needed, false otherwise.
|
|
*/
|
|
static inline bool
|
|
rtnl_notify_needed(const struct net *net, u16 nlflags, u32 group)
|
|
{
|
|
return (nlflags & NLM_F_ECHO) || rtnl_has_listeners(net, group);
|
|
}
|
|
|
|
void netif_set_operstate(struct net_device *dev, int newstate);
|
|
|
|
#endif /* __LINUX_RTNETLINK_H */
|