mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Link: https://lore.kernel.org/r/20220913230739.228313-1-nhuck@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Nathan Huckleberry 2022-09-13 16:07:38 -07:00 committed by Jakub Kicinski
parent 73c99e2603
commit 8bb7c4f8c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/openvswitch/vport-internal_dev.c
View File

@ -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;

2
net/openvswitch/vport.h
View File

@ -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;
};