Skip to contentSkip to conversation

put_ulong calls in lib_ring_buffer_compat_ioctl() should be compat?

DISCUSSION Mathieu Desnoyers 1 participant 1 message Dec 12, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw
Quoted 4 lines · * Corey Minyard ([email protected]) wrote:

I was noticing the that some of the put_ulong calls in lib_ring_buffer_compat_ioctl() were not compat_put_ulong. I can't imagine this is correct. Here's a patch to fix it, assuming that is wrong. It seems to work ok.

Merged, thanks!

Mathieu

Quoted 58 lines
lib/ringbuffer/ring_buffer_vfs.c +1 -1
index c69b64e..899af81 100644
@@ -331,7 +331,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp,  
 unsigned int cmd,
         data_size = lib_ring_buffer_get_read_data_size(config, buf);
         if (data_size > UINT_MAX)
             return -EFBIG;
-        return put_ulong(data_size, arg);
+        return compat_put_ulong(data_size, arg);
     }
     case RING_BUFFER_COMPAT_GET_PADDED_SUBBUF_SIZE:
     {
lib/ringbuffer/ring_buffer_vfs.c +2 -2
@@ -341,12 +341,12 @@ long lib_ring_buffer_compat_ioctl(struct file  
 *filp, unsigned int cmd,
         size = PAGE_ALIGN(size);
         if (size > UINT_MAX)
             return -EFBIG;
-        return put_ulong(size, arg);
+        return compat_put_ulong(size, arg);
     }
     case RING_BUFFER_COMPAT_GET_MAX_SUBBUF_SIZE:
         if (chan->backend.subbuf_size > UINT_MAX)
             return -EFBIG;
-        return put_ulong(chan->backend.subbuf_size, arg);
+        return compat_put_ulong(chan->backend.subbuf_size, arg);
     case RING_BUFFER_COMPAT_GET_MMAP_LEN:
     {
         unsigned long mmap_buf_len;
lib/ringbuffer/ring_buffer_vfs.c +1 -1
@@ -358,7 +358,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp,  
 unsigned int cmd,
             mmap_buf_len += chan->backend.subbuf_size;
         if (mmap_buf_len > UINT_MAX)
             return -EFBIG;
-        return put_ulong(mmap_buf_len, arg);
+        return compat_put_ulong(mmap_buf_len, arg);
     }
     case RING_BUFFER_COMPAT_GET_MMAP_READ_OFFSET:
     {
lib/ringbuffer/ring_buffer_vfs.c +1 -1
@@ -371,7 +371,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp,  
 unsigned int cmd,
         read_offset = buf->backend.array[sb_bindex]->mmap_offset;
         if (read_offset > UINT_MAX)
             return -EINVAL;
-        return put_ulong(read_offset, arg);
+        return compat_put_ulong(read_offset, arg);
     }
     case RING_BUFFER_COMPAT_FLUSH:
         lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 4 lines
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com