Commit 8bb7c4f8 authored by Nathan Huckleberry's avatar Nathan Huckleberry Committed by Jakub Kicinski

openvswitch: Change the return type for vport_ops.send function hook to int

All usages of the vport_ops struct have the .send field set to
dev_queue_xmit or internal_dev_recv.  Since most usages are set to
dev_queue_xmit, the function hook should match the signature of
dev_queue_xmit.

The only call to vport_ops->send() is in net/openvswitch/vport.c and it
throws away the return value.

This mismatched return type breaks forward edge kCFI since the underlying
function definition does not match the function hook definition.
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: default avatarNathan Huckleberry <nhuck@google.com>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Acked-by: default avatarEelco Chaudron <echaudro@redhat.com>
Link: https://lore.kernel.org/r/20220913230739.228313-1-nhuck@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 73c99e26
......@@ -190,7 +190,7 @@ static void internal_dev_destroy(struct vport *vport)
rtnl_unlock();
}
static netdev_tx_t internal_dev_recv(struct sk_buff *skb)
static int internal_dev_recv(struct sk_buff *skb)
{
struct net_device *netdev = skb->dev;
......
......@@ -132,7 +132,7 @@ struct vport_ops {
int (*set_options)(struct vport *, struct nlattr *);
int (*get_options)(const struct vport *, struct sk_buff *);
netdev_tx_t (*send) (struct sk_buff *skb);
int (*send)(struct sk_buff *skb);
struct module *owner;
struct list_head list;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment