ALSA: oxfw: some signedness bugs

This code tends to use unsigned variables by default and it causes
signedness bugs when we use negative variables for error handling.
The "i" and "j" variables are used to iterated over small positive
values and so they should be type "int".  The "len" variable doesn't
*need* to be signed but it should be signed to make the code easier to
read and audit.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index 9bc556b15a92b337d040f65f777a952415e66a9f..67ade0775a5b21b45329ef54db02a5a812b966ae 100644 (file)
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -19,7 +19,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params,
                .min = UINT_MAX, .max = 0, .integer = 1
        };
        struct snd_oxfw_stream_formation formation;
-       unsigned int i, err;
+       int i, err;
 
        for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
                if (formats[i] == NULL)
@@ -47,7 +47,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
        const struct snd_interval *r =
                hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);
        struct snd_oxfw_stream_formation formation;
-       unsigned int i, j, err;
+       int i, j, err;
        unsigned int count, list[SND_OXFW_STREAM_FORMAT_ENTRIES] = {0};
 
        count = 0;
@@ -80,7 +80,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
 static void limit_channels_and_rates(struct snd_pcm_hardware *hw, u8 **formats)
 {
        struct snd_oxfw_stream_formation formation;
-       unsigned int i, err;
+       int i, err;
 
        hw->channels_min = UINT_MAX;
        hw->channels_max = 0;

diff --git a/sound/firewire/oxfw/oxfw-proc.c b/sound/firewire/oxfw/oxfw-proc.c
index 604808e5526d4d4fc72b7118c22ccf5c413f8df7..8ba4f9f262b87f3a302f696a544809cdfb6dc5ed 100644 (file)
--- a/sound/firewire/oxfw/oxfw-proc.c
+++ b/sound/firewire/oxfw/oxfw-proc.c
@@ -15,7 +15,7 @@ static void proc_read_formation(struct snd_info_entry *entry,
        struct snd_oxfw_stream_formation formation, curr;
        u8 *format;
        char flag;
-       unsigned int i, err;
+       int i, err;
 
        /* Show input. */
        err = snd_oxfw_stream_get_current_formation(oxfw,

diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
index b77cf80f1678438fb51d7a871255c7c814ae4dbd..bda845afb470703ff0c05bd69f1caac5bfeabbd6 100644 (file)
--- a/sound/firewire/oxfw/oxfw-stream.c
+++ b/sound/firewire/oxfw/oxfw-stream.c
@@ -61,7 +61,8 @@ static int set_stream_format(struct snd_oxfw *oxfw, struct amdtp_stream *s,
        u8 **formats;
        struct snd_oxfw_stream_formation formation;
        enum avc_general_plug_dir dir;
-       unsigned int i, err, len;
+       unsigned int len;
+       int i, err;
 
        if (s == &oxfw->tx_stream) {
                formats = oxfw->tx_stream_formats;