h8300: missing checks of __get_user()/__put_user() return values

[karo-tx-linux.git] / net / wireless / wext-core.c

diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index af648e08e61b7f279dd99b8e87797148d746dd2a..b0eb7aa49b60a7c87d242213a4630c5d3402310f 100644 (file)
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -256,7 +256,7 @@ static const struct iw_ioctl_description standard_ioctl[] = {
                .max_tokens     = sizeof(struct iw_pmksa),
        },
 };
-static const unsigned standard_ioctl_num = ARRAY_SIZE(standard_ioctl);
+static const unsigned int standard_ioctl_num = ARRAY_SIZE(standard_ioctl);
 
 /*
  * Meta-data about all the additional standard Wireless Extension events
@@ -306,7 +306,7 @@ static const struct iw_ioctl_description standard_event[] = {
                .max_tokens     = sizeof(struct iw_pmkid_cand),
        },
 };
-static const unsigned standard_event_num = ARRAY_SIZE(standard_event);
+static const unsigned int standard_event_num = ARRAY_SIZE(standard_event);
 
 /* Size (in bytes) of various events */
 static const int event_type_size[] = {
@@ -402,7 +402,8 @@ static struct nlmsghdr *rtnetlink_ifinfo_prep(struct net_device *dev,
        r->ifi_flags = dev_get_flags(dev);
        r->ifi_change = 0;      /* Wireless changes don't affect those flags */
 
-       NLA_PUT_STRING(skb, IFLA_IFNAME, dev->name);
+       if (nla_put_string(skb, IFLA_IFNAME, dev->name))
+               goto nla_put_failure;
 
        return nlh;
  nla_put_failure:
@@ -428,7 +429,7 @@ void wireless_send_event(struct net_device *        dev,
        int hdr_len;                            /* Size of the event header */
        int wrqu_off = 0;                       /* Offset in wrqu */
        /* Don't "optimise" the following variable, it will crash */
-       unsigned        cmd_index;              /* *MUST* be unsigned */
+       unsigned int    cmd_index;              /* *MUST* be unsigned */
        struct sk_buff *skb;
        struct nlmsghdr *nlh;
        struct nlattr *nla;