| リビジョン | 86807e7bf717cebd2ece0dcf8f221b5d5b99cf4d (tree) |
|---|---|
| 日時 | 2006-08-30 15:07:48 |
| 作者 | PaX Team <pageexec@free...> |
| コミッター | Willy Tarreau |
[PATCH] cciss: do not mark cciss_scsi_detect init
if the cciss driver is compiled in then later discovery requests
initiated from userland will result in calling free'd memory since
the detect method is marked as init. suggested fix is to simply
not mark it as init, 2.6 has done it as well.
drivers/block/cciss_scsi.c (diff)| @@ -49,7 +49,7 @@ static int sendcmd( | ||
| 49 | 49 | unsigned char *scsi3addr ); |
| 50 | 50 | |
| 51 | 51 | |
| 52 | -int __init cciss_scsi_detect(Scsi_Host_Template *tpnt); | |
| 52 | +int cciss_scsi_detect(Scsi_Host_Template *tpnt); | |
| 53 | 53 | int cciss_scsi_release(struct Scsi_Host *sh); |
| 54 | 54 | const char *cciss_scsi_info(struct Scsi_Host *sa); |
| 55 | 55 |
| @@ -777,7 +777,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag) | ||
| 777 | 777 | The scsi mid layer (scsi_register_module) is |
| 778 | 778 | called from cciss.c:cciss_init_one(). */ |
| 779 | 779 | |
| 780 | -int __init | |
| 780 | +int | |
| 781 | 781 | cciss_scsi_detect(Scsi_Host_Template *tpnt) |
| 782 | 782 | { |
| 783 | 783 | int i; |
Linux Kernel Documents
Fork