samba36: fix autoshare CVE

package/network/services/samba36/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=4.0.26
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_SOURCE_URL:=https://ftp.samba.org/pub/samba/stable/
 PKG_SOURCE:=samba-$(PKG_VERSION).tar.gz

package/network/services/samba36/files/smb.auto

@@ -1,11 +1,12 @@
 #!/bin/sh
+
 #
 #  D-Team Technology Co.,Ltd. ShenZhen
 #  作者:Vic
 #
-#
 # 警告:对着屏幕的哥们,我们允许你使用此脚本，但不允许你抹去作者的信息,请保留这段话。
 #
+
 . /lib/functions.sh
 . /lib/functions/service.sh
 
@@ -30,7 +31,7 @@ smb_handle() {
 }
 
 chk_en() {
-	config_get_bool autoshare $1 autoshare 0
+	config_get_bool autoshare $1 autoshare 1
 	[ $autoshare -eq 0 ] && exit
 }
 
@@ -43,8 +44,8 @@ case "$ACTION" in
 	add)
 
 	case "$device" in
-                sd*) ;;
-                md*) ;;
+		sd*);;
+		md*);;
 		hd*);;
 		mmcblk*);;
 		*) return;;
@@ -54,7 +55,7 @@ case "$ACTION" in
 
 	wait_for_init
 
-        cat /proc/mounts | while read j
+	cat /proc/mounts | grep -v '/boot\|/opt|p1' | while read j
 	do
 		str=${j%% *}
 		if [ "$str" == $path ];then
@@ -71,6 +72,8 @@ case "$ACTION" in
 				echo -e "\toption path '$target'" >> $config_file
 				echo -e "\toption read_only 'no'" >> $config_file
 				echo -e "\toption guest_ok 'yes'" >> $config_file
+				echo -e "\toption create_mask '0666'" >> $config_file
+				echo -e "\toption dir_mask '0777'" >> $config_file
 				echo -e "\toption device '$device'" >> $config_file
 				/etc/init.d/samba reload
 				return
@@ -78,11 +81,11 @@ case "$ACTION" in
 		fi
 	done
 	;;
+
 	remove)
 		i=0
 		while true
 		do
-
 			dev=`uci get samba.@sambashare[$i].device`
 			[ $? -ne 0 ] && break
 
@@ -90,7 +93,6 @@ case "$ACTION" in
 				auto=`uci get samba.@sambashare[$i].auto`
 				[ $auto = "1" ] && {
 					mount_dir=`uci get samba.@sambashare[$i].name`
-					rm -rf /mnt/$device /mnt/$mount_dir
 					uci delete samba.@sambashare[$i]
 					uci commit
 					/etc/init.d/samba reload