tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
CIFS: Fix memory over bound bug in cifs_parse_mount_options

Linus Torvalds f727a938 cd2e49e9

+3 -2
+3 -2
fs/cifs/connect.c
··· 807 807 cifs_parse_mount_options(char *options, const char *devname, 808 808 struct smb_vol *vol) 809 809 { 810 - char *value; 811 - char *data; 810 + char *value, *data, *end; 812 811 unsigned int temp_len, i, j; 813 812 char separator[2]; 814 813 short int override_uid = -1; ··· 850 851 if (!options) 851 852 return 1; 852 853 854 + end = options + strlen(options); 853 855 if (strncmp(options, "sep=", 4) == 0) { 854 856 if (options[4] != 0) { 855 857 separator[0] = options[4]; ··· 916 916 the only illegal character in a password is null */ 917 917 918 918 if ((value[temp_len] == 0) && 919 + (value + temp_len < end) && 919 920 (value[temp_len+1] == separator[0])) { 920 921 /* reinsert comma */ 921 922 value[temp_len] = separator[0];