Merge branch 'for-next' into for-linus

Merged 4.8 changes.

4 files changed, 47 insertions, 20 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index b4fe9b002512..fb096cb20a80 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -807,6 +807,36 @@ static int snd_ctl_elem_list(struct snd_card *card,
         return 0;
 }
 
+static bool validate_element_member_dimension(struct snd_ctl_elem_info *info)
+{
+        unsigned int members;
+        unsigned int i;
+
+        if (info->dimen.d[0] == 0)
+                return true;
+
+        members = 1;
+        for (i = 0; i < ARRAY_SIZE(info->dimen.d); ++i) {
+                if (info->dimen.d[i] == 0)
+                        break;
+                members *= info->dimen.d[i];
+
+                /*
+                 * info->count should be validated in advance, to guarantee
+                 * calculation soundness.
+                 */
+                if (members > info->count)
+                        return false;
+        }
+
+        for (++i; i < ARRAY_SIZE(info->dimen.d); ++i) {
+                if (info->dimen.d[i] > 0)
+                        return false;
+        }
+
+        return members == info->count;
+}
+
 static int snd_ctl_elem_info(struct snd_ctl_file *ctl,
                              struct snd_ctl_elem_info *info)
 {
@@ -1274,6 +1304,8 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
         if (info->count < 1 ||
             info->count > max_value_counts[info->type])
                 return -EINVAL;
+        if (!validate_element_member_dimension(info))
+                return -EINVAL;
         private_size = value_sizes[info->type] * info->count;
 
         /*
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c
index b16dbef04174..cd0e0ebbfdb1 100644
--- a/sound/core/seq/oss/seq_oss_synth.c
+++ b/sound/core/seq/oss/seq_oss_synth.c
@@ -70,11 +70,11 @@ struct seq_oss_synth {
 static int max_synth_devs;
 static struct seq_oss_synth *synth_devs[SNDRV_SEQ_OSS_MAX_SYNTH_DEVS];
 static struct seq_oss_synth midi_synth_dev = {
-        -1, /* seq_device */
-        SYNTH_TYPE_MIDI, /* synth_type */
-        0, /* synth_subtype */
-        16, /* nr_voices */
-        "MIDI", /* name */
+        .seq_device = -1,
+        .synth_type = SYNTH_TYPE_MIDI,
+        .synth_subtype = 0,
+        .nr_voices = 16,
+        .name = "MIDI",
 };
 
 static DEFINE_SPINLOCK(register_lock);
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
index 293104926098..dcc102813aef 100644
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
@@ -165,7 +165,7 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri,
         snd_seq_timer_update_tick(&tmr->tick, resolution);
 
         /* register actual time of this timer update */
-        do_gettimeofday(&tmr->last_update);
+        ktime_get_ts64(&tmr->last_update);
 
         spin_unlock_irqrestore(&tmr->lock, flags);
 
@@ -392,7 +392,7 @@ static int seq_timer_start(struct snd_seq_timer *tmr)
                 return -EINVAL;
         snd_timer_start(tmr->timeri, tmr->ticks);
         tmr->running = 1;
-        do_gettimeofday(&tmr->last_update);
+        ktime_get_ts64(&tmr->last_update);
         return 0;
 }
 
@@ -420,7 +420,7 @@ static int seq_timer_continue(struct snd_seq_timer *tmr)
         }
         snd_timer_start(tmr->timeri, tmr->ticks);
         tmr->running = 1;
-        do_gettimeofday(&tmr->last_update);
+        ktime_get_ts64(&tmr->last_update);
         return 0;
 }
 
@@ -444,17 +444,12 @@ snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr)
         spin_lock_irqsave(&tmr->lock, flags);
         cur_time = tmr->cur_time;
         if (tmr->running) { 
-                struct timeval tm;
-                int usec;
-                do_gettimeofday(&tm);
-                usec = (int)(tm.tv_usec - tmr->last_update.tv_usec);
-                if (usec < 0) {
-                        cur_time.tv_nsec += (1000000 + usec) * 1000;
-                        cur_time.tv_sec += tm.tv_sec - tmr->last_update.tv_sec - 1;
-                } else {
-                        cur_time.tv_nsec += usec * 1000;
-                        cur_time.tv_sec += tm.tv_sec - tmr->last_update.tv_sec;
-                }
+                struct timespec64 tm;
+
+                ktime_get_ts64(&tm);
+                tm = timespec64_sub(tm, tmr->last_update);
+                cur_time.tv_nsec = tm.tv_nsec;
+                cur_time.tv_sec = tm.tv_sec;
                 snd_seq_sanity_real_time(&cur_time);
         }
         spin_unlock_irqrestore(&tmr->lock, flags);
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h
index 88dfb71805ae..9506b661fe5b 100644
--- a/sound/core/seq/seq_timer.h
+++ b/sound/core/seq/seq_timer.h
@@ -52,7 +52,7 @@ struct snd_seq_timer {
         unsigned int skew;
         unsigned int skew_base;
 
-        struct timeval          last_update;     /* time of last clock update, used for interpolation */
+        struct timespec64       last_update;     /* time of last clock update, used for interpolation */
 
         spinlock_t lock;
 };