Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / isa / gus / gus_dram.c

diff --git a/sound/isa/gus/gus_dram.c b/sound/isa/gus/gus_dram.c
index 44895d3..f22fe79 100644 (file)
--- a/sound/isa/gus/gus_dram.c
+++ b/sound/isa/gus/gus_dram.c
@@ -26,17 +26,17 @@
 #include <sound/info.h>
 
 
-static int snd_gus_dram_poke(snd_gus_card_t *gus, char *_buffer,
+static int snd_gus_dram_poke(struct snd_gus_card *gus, char __user *_buffer,
                             unsigned int address, unsigned int size)
 {
        unsigned long flags;
        unsigned int size1, size2;
-       char buffer[512], *pbuffer;
+       char buffer[256], *pbuffer;
 
        while (size > 0) {
-               if (copy_from_user(buffer, _buffer, 512))
+               size1 = size > sizeof(buffer) ? sizeof(buffer) : size;
+               if (copy_from_user(buffer, _buffer, size1))
                        return -EFAULT;
-               size1 = size > 512 ? 512 : size;
                if (gus->interwave) {
                        spin_lock_irqsave(&gus->reg_lock, flags);
                        snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, 0x01);
@@ -57,22 +57,22 @@ static int snd_gus_dram_poke(snd_gus_card_t *gus, char *_buffer,
 }
 
 
-int snd_gus_dram_write(snd_gus_card_t *gus, char *buffer,
+int snd_gus_dram_write(struct snd_gus_card *gus, char __user *buffer,
                       unsigned int address, unsigned int size)
 {
        return snd_gus_dram_poke(gus, buffer, address, size);
 }
 
-static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer,
+static int snd_gus_dram_peek(struct snd_gus_card *gus, char __user *_buffer,
                             unsigned int address, unsigned int size,
                             int rom)
 {
        unsigned long flags;
        unsigned int size1, size2;
-       char buffer[512], *pbuffer;
+       char buffer[256], *pbuffer;
 
        while (size > 0) {
-               size1 = size > 512 ? 512 : size;
+               size1 = size > sizeof(buffer) ? sizeof(buffer) : size;
                if (gus->interwave) {
                        spin_lock_irqsave(&gus->reg_lock, flags);
                        snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, rom ? 0x03 : 0x01);
@@ -95,7 +95,7 @@ static int snd_gus_dram_peek(snd_gus_card_t *gus, char *_buffer,
        return 0;
 }
 
-int snd_gus_dram_read(snd_gus_card_t *gus, char *buffer,
+int snd_gus_dram_read(struct snd_gus_card *gus, char __user *buffer,
                      unsigned int address, unsigned int size,
                      int rom)
 {