iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AX.25]: Mark all kmalloc users __must_check

Browse Source 
The recent fix 0506d4068b made obvious that
error values were not being propagated through the AX.25 stack.  To help
with that this patch marks all kmalloc users in the AX.25, NETROM and
ROSE stacks as __must_check.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ralf Baechle 2006-12-14 15:49:28 -08:00 committed by David S. Miller
parent bd2b334378
commit c9266b99e2
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/net/ax25.h
View File

@ -277,7 +277,7 @@ struct sock *ax25_get_socket(ax25_address *, ax25_address *, int);
extern ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *, struct net_device *); extern ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *, struct net_device *);
extern void ax25_send_to_raw(ax25_address *, struct sk_buff *, int); extern void ax25_send_to_raw(ax25_address *, struct sk_buff *, int);
extern void ax25_destroy_socket(ax25_cb *); extern void ax25_destroy_socket(ax25_cb *);
extern ax25_cb *ax25_create_cb(void); extern ax25_cb * __must_check ax25_create_cb(void);
extern void ax25_fillin_cb(ax25_cb *, ax25_dev *); extern void ax25_fillin_cb(ax25_cb *, ax25_dev *);
extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *); extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *);
@ -333,11 +333,12 @@ extern void ax25_ds_t3timer_expiry(ax25_cb *);
extern void ax25_ds_idletimer_expiry(ax25_cb *); extern void ax25_ds_idletimer_expiry(ax25_cb *);
/* ax25_iface.c */ /* ax25_iface.c */
extern int ax25_protocol_register(unsigned int, int (*)(struct sk_buff *, ax25_cb *)); extern int __must_check ax25_protocol_register(unsigned int, int (*)(struct sk_buff *, ax25_cb *));
extern void ax25_protocol_release(unsigned int); extern void ax25_protocol_release(unsigned int);
extern int ax25_linkfail_register(void (*)(ax25_cb *, int)); extern int __must_check ax25_linkfail_register(void (*)(ax25_cb *, int));
extern void ax25_linkfail_release(void (*)(ax25_cb *, int)); extern void ax25_linkfail_release(void (*)(ax25_cb *, int));
extern int ax25_listen_register(ax25_address *, struct net_device *); extern int __must_check ax25_listen_register(ax25_address *,
struct net_device *);
extern void ax25_listen_release(ax25_address *, struct net_device *); extern void ax25_listen_release(ax25_address *, struct net_device *);
extern int (*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *); extern int (*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *);
extern int ax25_listen_mine(ax25_address *, struct net_device *); extern int ax25_listen_mine(ax25_address *, struct net_device *);
@ -415,7 +416,7 @@ extern unsigned long ax25_display_timer(struct timer_list *);
/* ax25_uid.c */ /* ax25_uid.c */
extern int ax25_uid_policy; extern int ax25_uid_policy;
extern ax25_uid_assoc *ax25_findbyuid(uid_t); extern ax25_uid_assoc *ax25_findbyuid(uid_t);
extern int ax25_uid_ioctl(int, struct sockaddr_ax25 *); extern int __must_check ax25_uid_ioctl(int, struct sockaddr_ax25 *);
extern struct file_operations ax25_uid_fops; extern struct file_operations ax25_uid_fops;
extern void ax25_uid_free(void); extern void ax25_uid_free(void);

4
include/net/rose.h
View File

@ -193,8 +193,8 @@ extern struct file_operations rose_neigh_fops;
extern struct file_operations rose_nodes_fops; extern struct file_operations rose_nodes_fops;
extern struct file_operations rose_routes_fops; extern struct file_operations rose_routes_fops;
extern int rose_add_loopback_neigh(void); extern int __must_check rose_add_loopback_neigh(void);
extern int rose_add_loopback_node(rose_address *); extern int __must_check rose_add_loopback_node(rose_address *);
extern void rose_del_loopback_node(rose_address *); extern void rose_del_loopback_node(rose_address *);
extern void rose_rt_device_down(struct net_device *); extern void rose_rt_device_down(struct net_device *);
extern void rose_link_device_down(struct net_device *); extern void rose_link_device_down(struct net_device *);

4
net/ax25/af_ax25.c
View File

@ -1088,8 +1088,8 @@ out:
/* /*
* FIXME: nonblock behaviour looks like it may have a bug. * FIXME: nonblock behaviour looks like it may have a bug.
*/ */
static int ax25_connect(struct socket *sock, struct sockaddr *uaddr, static int __must_check ax25_connect(struct socket *sock,
int addr_len, int flags) struct sockaddr *uaddr, int addr_len, int flags)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
ax25_cb *ax25 = ax25_sk(sk), *ax25t; ax25_cb *ax25 = ax25_sk(sk), *ax25t;

2
net/ax25/ax25_route.c
View File

@ -71,7 +71,7 @@ void ax25_rt_device_down(struct net_device *dev)
write_unlock(&ax25_route_lock); write_unlock(&ax25_route_lock);
} }
static int ax25_rt_add(struct ax25_routes_struct *route) static int __must_check ax25_rt_add(struct ax25_routes_struct *route)
{ {
ax25_route *ax25_rt; ax25_route *ax25_rt;
ax25_dev *ax25_dev; ax25_dev *ax25_dev;

8
net/netrom/nr_route.c
View File

@ -87,8 +87,9 @@ static void nr_remove_neigh(struct nr_neigh *);
* Add a new route to a node, and in the process add the node and the * Add a new route to a node, and in the process add the node and the
* neighbour if it is new. * neighbour if it is new.
*/ */
static int nr_add_node(ax25_address *nr, const char *mnemonic, ax25_address *ax25, static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic,
ax25_digi *ax25_digi, struct net_device *dev, int quality, int obs_count) ax25_address *ax25, ax25_digi *ax25_digi, struct net_device *dev,
int quality, int obs_count)
{ {
struct nr_node *nr_node; struct nr_node *nr_node;
struct nr_neigh *nr_neigh; struct nr_neigh *nr_neigh;
@ -406,7 +407,8 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n
/* /*
* Lock a neighbour with a quality. * Lock a neighbour with a quality.
*/ */
static int nr_add_neigh(ax25_address *callsign, ax25_digi *ax25_digi, struct net_device *dev, unsigned int quality) static int __must_check nr_add_neigh(ax25_address *callsign,
ax25_digi *ax25_digi, struct net_device *dev, unsigned int quality)
{ {
struct nr_neigh *nr_neigh; struct nr_neigh *nr_neigh;

2
net/rose/rose_route.c
View File

@ -52,7 +52,7 @@ struct rose_neigh *rose_loopback_neigh;
* Add a new route to a node, and in the process add the node and the * Add a new route to a node, and in the process add the node and the
* neighbour if it is new. * neighbour if it is new.
*/ */
static int rose_add_node(struct rose_route_struct *rose_route, static int __must_check rose_add_node(struct rose_route_struct *rose_route,
struct net_device *dev) struct net_device *dev)
{ {
struct rose_node *rose_node, *rose_tmpn, *rose_tmpp; struct rose_node *rose_node, *rose_tmpn, *rose_tmpp;