Linux kernel & device driver programming

Cross-Referenced Linux and Device Driver Code

[ source navigation ] [ diff markup ] [ identifier search ] [ freetext search ] [ file search ]
Version: [ 2.6.11.8 ] [ 2.6.25 ] [ 2.6.25.8 ] [ 2.6.31.13 ] Architecture: [ i386 ]

Diff markup

Differences between /linux/fs/binfmt_script.c (Version 2.6.31.13) and /linux/fs/binfmt_script.c (Version 2.6.11.8)


  1 /*                                                  1 /*
  2  *  linux/fs/binfmt_script.c                        2  *  linux/fs/binfmt_script.c
  3  *                                                  3  *
  4  *  Copyright (C) 1996  Martin von Löwis      !!   4  *  Copyright (C) 1996  Martin von Löwis
  5  *  original #!-checking implemented by tytso.      5  *  original #!-checking implemented by tytso.
  6  */                                                 6  */
  7                                                     7 
  8 #include <linux/module.h>                           8 #include <linux/module.h>
  9 #include <linux/string.h>                           9 #include <linux/string.h>
 10 #include <linux/stat.h>                            10 #include <linux/stat.h>
 11 #include <linux/slab.h>                            11 #include <linux/slab.h>
 12 #include <linux/binfmts.h>                         12 #include <linux/binfmts.h>
 13 #include <linux/init.h>                            13 #include <linux/init.h>
 14 #include <linux/file.h>                            14 #include <linux/file.h>
                                                   >>  15 #include <linux/smp_lock.h>
 15 #include <linux/err.h>                             16 #include <linux/err.h>
 16 #include <linux/fs.h>                              17 #include <linux/fs.h>
 17                                                    18 
 18 static int load_script(struct linux_binprm *bp     19 static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
 19 {                                                  20 {
 20         char *cp, *i_name, *i_arg;                 21         char *cp, *i_name, *i_arg;
 21         struct file *file;                         22         struct file *file;
 22         char interp[BINPRM_BUF_SIZE];              23         char interp[BINPRM_BUF_SIZE];
 23         int retval;                                24         int retval;
 24                                                    25 
 25         if ((bprm->buf[0] != '#') || (bprm->bu !!  26         if ((bprm->buf[0] != '#') || (bprm->buf[1] != '!') || (bprm->sh_bang)) 
 26             (bprm->recursion_depth > BINPRM_MA << 
 27                 return -ENOEXEC;                   27                 return -ENOEXEC;
 28         /*                                         28         /*
 29          * This section does the #! interpreta     29          * This section does the #! interpretation.
 30          * Sorta complicated, but hopefully it     30          * Sorta complicated, but hopefully it will work.  -TYT
 31          */                                        31          */
 32                                                    32 
 33         bprm->recursion_depth++;               !!  33         bprm->sh_bang++;
 34         allow_write_access(bprm->file);            34         allow_write_access(bprm->file);
 35         fput(bprm->file);                          35         fput(bprm->file);
 36         bprm->file = NULL;                         36         bprm->file = NULL;
 37                                                    37 
 38         bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';     38         bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';
 39         if ((cp = strchr(bprm->buf, '\n')) ==      39         if ((cp = strchr(bprm->buf, '\n')) == NULL)
 40                 cp = bprm->buf+BINPRM_BUF_SIZE     40                 cp = bprm->buf+BINPRM_BUF_SIZE-1;
 41         *cp = '\0';                                41         *cp = '\0';
 42         while (cp > bprm->buf) {                   42         while (cp > bprm->buf) {
 43                 cp--;                              43                 cp--;
 44                 if ((*cp == ' ') || (*cp == '\     44                 if ((*cp == ' ') || (*cp == '\t'))
 45                         *cp = '\0';                45                         *cp = '\0';
 46                 else                               46                 else
 47                         break;                     47                         break;
 48         }                                          48         }
 49         for (cp = bprm->buf+2; (*cp == ' ') ||     49         for (cp = bprm->buf+2; (*cp == ' ') || (*cp == '\t'); cp++);
 50         if (*cp == '\0')                           50         if (*cp == '\0') 
 51                 return -ENOEXEC; /* No interpr     51                 return -ENOEXEC; /* No interpreter name found */
 52         i_name = cp;                               52         i_name = cp;
 53         i_arg = NULL;                              53         i_arg = NULL;
 54         for ( ; *cp && (*cp != ' ') && (*cp !=     54         for ( ; *cp && (*cp != ' ') && (*cp != '\t'); cp++)
 55                 /* nothing */ ;                    55                 /* nothing */ ;
 56         while ((*cp == ' ') || (*cp == '\t'))      56         while ((*cp == ' ') || (*cp == '\t'))
 57                 *cp++ = '\0';                      57                 *cp++ = '\0';
 58         if (*cp)                                   58         if (*cp)
 59                 i_arg = cp;                        59                 i_arg = cp;
 60         strcpy (interp, i_name);                   60         strcpy (interp, i_name);
 61         /*                                         61         /*
 62          * OK, we've parsed out the interprete     62          * OK, we've parsed out the interpreter name and
 63          * (optional) argument.                    63          * (optional) argument.
 64          * Splice in (1) the interpreter's nam     64          * Splice in (1) the interpreter's name for argv[0]
 65          *           (2) (optional) argument t     65          *           (2) (optional) argument to interpreter
 66          *           (3) filename of shell scr     66          *           (3) filename of shell script (replace argv[0])
 67          *                                         67          *
 68          * This is done in reverse order, beca     68          * This is done in reverse order, because of how the
 69          * user environment and arguments are      69          * user environment and arguments are stored.
 70          */                                        70          */
 71         retval = remove_arg_zero(bprm);        !!  71         remove_arg_zero(bprm);
 72         if (retval)                            << 
 73                 return retval;                 << 
 74         retval = copy_strings_kernel(1, &bprm-     72         retval = copy_strings_kernel(1, &bprm->interp, bprm);
 75         if (retval < 0) return retval;             73         if (retval < 0) return retval; 
 76         bprm->argc++;                              74         bprm->argc++;
 77         if (i_arg) {                               75         if (i_arg) {
 78                 retval = copy_strings_kernel(1     76                 retval = copy_strings_kernel(1, &i_arg, bprm);
 79                 if (retval < 0) return retval;     77                 if (retval < 0) return retval; 
 80                 bprm->argc++;                      78                 bprm->argc++;
 81         }                                          79         }
 82         retval = copy_strings_kernel(1, &i_nam     80         retval = copy_strings_kernel(1, &i_name, bprm);
 83         if (retval) return retval;                 81         if (retval) return retval; 
 84         bprm->argc++;                              82         bprm->argc++;
 85         bprm->interp = interp;                     83         bprm->interp = interp;
 86                                                    84 
 87         /*                                         85         /*
 88          * OK, now restart the process with th     86          * OK, now restart the process with the interpreter's dentry.
 89          */                                        87          */
 90         file = open_exec(interp);                  88         file = open_exec(interp);
 91         if (IS_ERR(file))                          89         if (IS_ERR(file))
 92                 return PTR_ERR(file);              90                 return PTR_ERR(file);
 93                                                    91 
 94         bprm->file = file;                         92         bprm->file = file;
 95         retval = prepare_binprm(bprm);             93         retval = prepare_binprm(bprm);
 96         if (retval < 0)                            94         if (retval < 0)
 97                 return retval;                     95                 return retval;
 98         return search_binary_handler(bprm,regs     96         return search_binary_handler(bprm,regs);
 99 }                                                  97 }
100                                                    98 
101 static struct linux_binfmt script_format = {       99 static struct linux_binfmt script_format = {
102         .module         = THIS_MODULE,            100         .module         = THIS_MODULE,
103         .load_binary    = load_script,            101         .load_binary    = load_script,
104 };                                                102 };
105                                                   103 
106 static int __init init_script_binfmt(void)        104 static int __init init_script_binfmt(void)
107 {                                                 105 {
108         return register_binfmt(&script_format)    106         return register_binfmt(&script_format);
109 }                                                 107 }
110                                                   108 
111 static void __exit exit_script_binfmt(void)       109 static void __exit exit_script_binfmt(void)
112 {                                                 110 {
113         unregister_binfmt(&script_format);        111         unregister_binfmt(&script_format);
114 }                                                 112 }
115                                                   113 
116 core_initcall(init_script_binfmt);                114 core_initcall(init_script_binfmt);
117 module_exit(exit_script_binfmt);                  115 module_exit(exit_script_binfmt);
118 MODULE_LICENSE("GPL");                            116 MODULE_LICENSE("GPL");
119                                                   117 
  This page was automatically generated by the LXR engine.