CINXE.COM
LKML: Christoph Hellwig: Re: [PATCH 1/2] sanitize ->fb_ioctl prototype
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Christoph Hellwig: Re: [PATCH 1/2] sanitize ->fb_ioctl prototype</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Christoph Hellwig" href="/groupie.php?aid=30078" /><!--Matomo--><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script><!--End Matomo Code--></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/11"> [Nov]</a> 聽 <a class="nb" href="/lkml/2005/11/13"> [13]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/11/13/10" onclick="this.href='/lkml/headers'+'/2005/11/13/10';">[headers]</a>聽 <a href="/lkml/bounce/2005/11/13/10">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/11/11/30">First message in thread</a></li><li><a href="/lkml/2005/11/11/30">Christoph Hellwig</a><ul><li class="origin"><a href="">Christoph Hellwig</a></li><li><a href="/lkml/2006/1/4/58">Christoph Hellwig</a></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/11/13/10/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Sun, 13 Nov 2005 08:38:47 +0100</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Christoph Hellwig <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: [PATCH 1/2] sanitize ->fb_ioctl prototype</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">On Fri, Nov 11, 2005 at 09:34:57AM +0100, Christoph Hellwig wrote:<br />> The ioctl and file arguments to ->fb_ioctl are totally unused and there's<br />> not reason a driver should need them.<br />> <br />> Also update the ->fb_compat_ioctl prototype to be the same as ->fb_mmap.<br /><br />Updates for the newly added sbusfb_compat_ioctl:<br /><br /><br />Index: linux-2.6/drivers/video/sbuslib.c<br />===================================================================<br />--- linux-2.6.orig/drivers/video/sbuslib.c 2005-11-12 23:49:59.000000000 +0100<br />+++ linux-2.6/drivers/video/sbuslib.c 2005-11-12 23:56:33.000000000 +0100<br />@@ -196,8 +196,8 @@<br /> #define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)<br /> #define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)<br /> <br />-static int fbiogetputcmap(struct file *file, struct fb_info *info,<br />- unsigned int cmd, unsigned long arg)<br />+static int fbiogetputcmap(struct fb_info *info, unsigned int cmd,<br />+ unsigned long arg)<br /> {<br /> struct fbcmap32 __user *argp = (void __user *)arg;<br /> struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p));<br />@@ -213,10 +213,9 @@<br /> ret |= put_user(compat_ptr(addr), &p->blue);<br /> if (ret)<br /> return -EFAULT;<br />- return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,<br />- (cmd == FBIOPUTCMAP32) ?<br />+ return info->fbops->fb_ioctl(info, (cmd == FBIOPUTCMAP32) ?<br /> FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC,<br />- (unsigned long)p, info);<br />+ (unsigned long)p);<br /> }<br /> <br /> struct fbcursor32 {<br />@@ -233,8 +232,7 @@<br /> #define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)<br /> #define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)<br /> <br />-static int fbiogscursor(struct file *file, struct fb_info *info,<br />- unsigned long arg)<br />+static int fbiogscursor(struct fb_info *info, unsigned long arg)<br /> {<br /> struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));<br /> struct fbcursor32 __user *argp = (void __user *)arg;<br />@@ -257,12 +255,11 @@<br /> ret |= put_user(compat_ptr(addr), &p->image);<br /> if (ret)<br /> return -EFAULT;<br />- return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,<br />- FBIOSCURSOR, (unsigned long)p, info);<br />+ return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);<br /> }<br /> <br />-long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,<br />- unsigned long arg, struct fb_info *info)<br />+int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,<br />+ unsigned long arg)<br /> {<br /> switch (cmd) {<br /> case FBIOGTYPE:<br />@@ -275,14 +272,13 @@<br /> case FBIOSCURPOS:<br /> case FBIOGCURPOS:<br /> case FBIOGCURMAX:<br />- return info->fbops->fb_ioctl(file->f_dentry->d_inode,<br />- file, cmd, arg, info);<br />+ return info->fbops->fb_ioctl(info, cmd, arg);<br /> case FBIOPUTCMAP32:<br />- return fbiogetputcmap(file, info, cmd, arg);<br />+ return fbiogetputcmap(info, cmd, arg);<br /> case FBIOGETCMAP32:<br />- return fbiogetputcmap(file, info, cmd, arg);<br />+ return fbiogetputcmap(info, cmd, arg);<br /> case FBIOSCURSOR32:<br />- return fbiogscursor(file, info, arg);<br />+ return fbiogscursor(info, arg);<br /> default:<br /> return -ENOIOCTLCMD;<br /> }<br />Index: linux-2.6/drivers/video/sbuslib.h<br />===================================================================<br />--- linux-2.6.orig/drivers/video/sbuslib.h 2005-11-12 23:49:59.000000000 +0100<br />+++ linux-2.6/drivers/video/sbuslib.h 2005-11-12 23:54:53.000000000 +0100<br />@@ -20,7 +20,7 @@<br /> int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,<br /> struct fb_info *info,<br /> int type, int fb_depth, unsigned long fb_size);<br />-long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,<br />- unsigned long arg, struct fb_info *info);<br />+int sbusfb_compat_ioctl(struct fb_info *info, struct file *file,<br />+ unsigned int cmd);<br /> <br /> #endif /* _SBUSLIB_H */<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-11-13 08:41 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>